From 51ff62791119ba6cbe0557701aaf4f6873469623 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Wed, 11 Oct 2023 16:39:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=BA=E9=99=B7=E6=A8=A1=E6=9D=BF=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/ProjectCustomFieldController.java        | 2 +-
 .../project/controller/ProjectTemplateController.java           | 2 +-
 .../src/main/java/io/metersphere/project/dto/ModuleDTO.java     | 2 +-
 .../metersphere/project/request/ProjectApplicationRequest.java  | 2 +-
 .../java/io/metersphere/system/service/BaseTemplateService.java | 2 +-
 .../system/service/CreateTemplateResourceService.java           | 2 +-
 .../metersphere/system/service/OrganizationTemplateService.java | 2 --
 7 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectCustomFieldController.java b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectCustomFieldController.java
index d69aa16ba6..fff3c21872 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectCustomFieldController.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectCustomFieldController.java
@@ -39,7 +39,7 @@ public class ProjectCustomFieldController {
     @RequiresPermissions(PermissionConstants.PROJECT_CUSTOM_FIELD_READ)
     public List<CustomField> list(@Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
                                   @PathVariable String projectId,
-                                  @Schema(description = "模板的使用场景（FUNCTIONAL,ISSUE,API,UI）", requiredMode = Schema.RequiredMode.REQUIRED)
+                                  @Schema(description = "模板的使用场景（FUNCTIONAL,BUG,API,UI）", requiredMode = Schema.RequiredMode.REQUIRED)
                                   @PathVariable String scene) {
         return projectCustomFieldService.list(projectId, scene);
     }
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java
index 8d8669d2c2..474fe2ac4d 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java
@@ -39,7 +39,7 @@ public class ProjectTemplateController {
     @RequiresPermissions(PermissionConstants.PROJECT_TEMPLATE_READ)
     public List<Template> list(@Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
                                @PathVariable String projectId,
-                               @Schema(description = "模板的使用场景（FUNCTIONAL,ISSUE,API,UI）", requiredMode = Schema.RequiredMode.REQUIRED)
+                               @Schema(description = "模板的使用场景（FUNCTIONAL,BUG,API,UI）", requiredMode = Schema.RequiredMode.REQUIRED)
                                @PathVariable String scene) {
         return projectTemplateservice.list(projectId, scene);
     }
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/dto/ModuleDTO.java b/backend/services/project-management/src/main/java/io/metersphere/project/dto/ModuleDTO.java
index bd235dddac..0806e424cc 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/dto/ModuleDTO.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/dto/ModuleDTO.java
@@ -10,7 +10,7 @@ public class ModuleDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "模块", allowableValues = {"WORKSTATION", "TEST_PLAN", "UI", "PERFORMANCE_TEST", "API", "CASE", "ISSUE"})
+    @Schema(description = "模块", allowableValues = {"WORKSTATION", "TEST_PLAN", "UI", "PERFORMANCE_TEST", "API", "CASE", "BUG"})
     private String module;
 
     @Schema(description = "是否启用", allowableValues = {"true", "false"})
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectApplicationRequest.java b/backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectApplicationRequest.java
index 36efa56eb3..c88025effc 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectApplicationRequest.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/request/ProjectApplicationRequest.java
@@ -21,6 +21,6 @@ public class ProjectApplicationRequest implements Serializable {
     @NotBlank(message = "{project_application.project_id.not_blank}")
     private String projectId;
 
-    @Schema(description = "配置类型列表", allowableValues = {"WORKSTATION", "TEST_PLAN", "UI", "PERFORMANCE_TEST", "API", "CASE", "ISSUE"}, requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "配置类型列表", allowableValues = {"WORKSTATION", "TEST_PLAN", "UI", "PERFORMANCE_TEST", "API", "CASE", "BUG"}, requiredMode = Schema.RequiredMode.REQUIRED)
     private String type;
 }
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java
index f93d4b9d23..9acff7ec8c 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java
@@ -303,7 +303,7 @@ public class BaseTemplateService {
      * @param scopeId
      * @param scopeType
      */
-    public void initIssueDefaultTemplate(String scopeId, TemplateScopeType scopeType) {
+    public void initBugDefaultTemplate(String scopeId, TemplateScopeType scopeType) {
         this.initDefaultTemplate(scopeId, "bug_default", scopeType, TemplateScene.BUG);
     }
     public void initApiDefaultTemplate(String scopeId, TemplateScopeType scopeType) {
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/CreateTemplateResourceService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/CreateTemplateResourceService.java
index 99df637ec0..ee5f974522 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/CreateTemplateResourceService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/CreateTemplateResourceService.java
@@ -62,7 +62,7 @@ public class CreateTemplateResourceService implements CreateProjectResourceServi
                 baseTemplateService.initFunctionalDefaultTemplate(projectId, TemplateScopeType.PROJECT);
                 break;
             case BUG:
-                baseTemplateService.initIssueDefaultTemplate(projectId, TemplateScopeType.PROJECT);
+                baseTemplateService.initBugDefaultTemplate(projectId, TemplateScopeType.PROJECT);
                 break;
             case API:
                 baseTemplateService.initApiDefaultTemplate(projectId, TemplateScopeType.PROJECT);
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java
index 632cbda61a..63acdedf79 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java
@@ -32,8 +32,6 @@ public class OrganizationTemplateService extends BaseTemplateService {
     @Resource
     private BaseProjectMapper baseProjectMapper;
     @Resource
-    private BaseCustomFieldService baseCustomFieldService;
-    @Resource
     protected ExtOrganizationTemplateMapper extOrganizationTemplateMapper;
     @Resource
     protected BaseOrganizationParameterService baseOrganizationParameterService;