From 49320306e6d292773184f944428c6b9156dc02fe Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 19 Sep 2022 14:22:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=A8=A1=E6=9D=BF=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016830 --user=宋昌昌 【测试跟踪】缺陷模板里设置了整型字段默认值1，创建缺陷时默认显示了0 https://www.tapd.cn/55049933/s/1244852
---
 .../base/mapper/ext/ExtCustomFieldTemplateMapper.java      | 2 ++
 .../base/mapper/ext/ExtCustomFieldTemplateMapper.xml       | 7 +++++++
 .../java/io/metersphere/service/CustomFieldService.java    | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java
index 4ba95979b7..bfda750468 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.java
@@ -10,6 +10,8 @@ import java.util.List;
 public interface ExtCustomFieldTemplateMapper {
     List<String> getCustomFieldIds(@Param("templateId") String templateId);
 
+    List<CustomFieldTemplate> getCustomFields(@Param("templateId") String templateId);
+
     List<CustomFieldTemplateDao> list(@Param("request") CustomFieldTemplate request);
 
     List<CustomFieldDao> lisSimple(@Param("request") CustomFieldTemplate request);
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml
index 7d36db607a..31a637fb71 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtCustomFieldTemplateMapper.xml
@@ -7,6 +7,13 @@
         from custom_field_template
         where custom_field_template.template_id = #{templateId}
     </select>
+
+    <select id="getCustomFields" resultType="io.metersphere.base.domain.CustomFieldTemplate">
+        select id, field_id fieldId, template_id templateId, scene, required, `order`, default_value defaultValue, custom_data customData, `key`
+        from custom_field_template
+        where custom_field_template.template_id = #{templateId}
+    </select>
+
     <select id="list" resultType="io.metersphere.dto.CustomFieldTemplateDao">
         select
         field_id, template_id, required, default_value, custom_data,
diff --git a/backend/src/main/java/io/metersphere/service/CustomFieldService.java b/backend/src/main/java/io/metersphere/service/CustomFieldService.java
index ed55e7174e..ebe4330bd9 100644
--- a/backend/src/main/java/io/metersphere/service/CustomFieldService.java
+++ b/backend/src/main/java/io/metersphere/service/CustomFieldService.java
@@ -11,6 +11,7 @@ import io.metersphere.base.mapper.CustomFieldIssuesMapper;
 import io.metersphere.base.mapper.CustomFieldMapper;
 import io.metersphere.base.mapper.ProjectMapper;
 import io.metersphere.base.mapper.ext.ExtCustomFieldMapper;
+import io.metersphere.base.mapper.ext.ExtCustomFieldTemplateMapper;
 import io.metersphere.commons.constants.CustomFieldType;
 import io.metersphere.commons.constants.TemplateConstants;
 import io.metersphere.commons.exception.MSException;
@@ -58,6 +59,8 @@ public class CustomFieldService {
     private ProjectMapper projectMapper;
     @Resource
     private CustomFieldIssuesMapper customFieldIssuesMapper;
+    @Resource
+    private ExtCustomFieldTemplateMapper extCustomFieldTemplateMapper;
 
     public String add(CustomField customField) {
         checkExist(customField);
@@ -130,7 +133,7 @@ public class CustomFieldService {
     }
 
     public List<CustomFieldDao> getCustomFieldByTemplateId(String templateId) {
-        List<CustomFieldTemplate> customFields = customFieldTemplateService.getCustomFields(templateId);
+        List<CustomFieldTemplate> customFields = extCustomFieldTemplateMapper.getCustomFields(templateId);
         List<String> fieldIds = customFields.stream()
                 .map(CustomFieldTemplate::getFieldId)
                 .collect(Collectors.toList());