From 691c2c64078dd853587648dd6cff269152b7c056 Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Mon, 19 Sep 2022 15:16:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E6=B2=A1=E6=9C=89=E5=80=BC=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=20(#17994)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016860 --user=王孝刚 【项目设置】接口模板，模板里设置了默认值，但是创建接口的时候没有显示
https://www.tapd.cn/55049933/s/1244982

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../service/CustomFieldTemplateService.java           | 11 ++++++-----
 .../components/api/definition/ApiDefinition.vue       |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
index 5626f7e8fe..70fd0c0201 100644
--- a/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/CustomFieldTemplateService.java
@@ -45,7 +45,7 @@ public class CustomFieldTemplateService {
         CustomFieldTemplateExample example = new CustomFieldTemplateExample();
         example.createCriteria().andTemplateIdEqualTo(templateId);
         example.setOrderByClause("`order` asc");
-        return customFieldTemplateMapper.selectByExample(example);
+        return customFieldTemplateMapper.selectByExampleWithBLOBs(example);
     }
 
     public List<CustomFieldTemplateDao> list(CustomFieldTemplate request) {
@@ -72,7 +72,7 @@ public class CustomFieldTemplateService {
         }
     }
 
-    public  List<CustomFieldTemplate> getSystemFieldCreateTemplate(CustomFieldDao customField, String templateId) {
+    public List<CustomFieldTemplate> getSystemFieldCreateTemplate(CustomFieldDao customField, String templateId) {
         CustomFieldTemplateExample example = new CustomFieldTemplateExample();
         example.createCriteria().andTemplateIdEqualTo(templateId);
         // 获取全局模板的关联关系
@@ -87,7 +87,7 @@ public class CustomFieldTemplateService {
         return fieldTemplates;
     }
 
-    public  void updateFieldIdByTemplate(String templateId, String originId , String fieldId) {
+    public void updateFieldIdByTemplate(String templateId, String originId, String fieldId) {
         CustomFieldTemplateExample example = new CustomFieldTemplateExample();
         example.createCriteria()
                 .andTemplateIdEqualTo(templateId)
@@ -97,7 +97,7 @@ public class CustomFieldTemplateService {
         customFieldTemplateMapper.updateByExampleSelective(customFieldTemplate, example);
     }
 
-    public  List<CustomFieldTemplate> getFieldTemplateByFieldIds(List<String> fieldIds) {
+    public List<CustomFieldTemplate> getFieldTemplateByFieldIds(List<String> fieldIds) {
         if (CollectionUtils.isNotEmpty(fieldIds)) {
             CustomFieldTemplateExample example = new CustomFieldTemplateExample();
             example.createCriteria().andFieldIdIn(fieldIds);
@@ -144,13 +144,14 @@ public class CustomFieldTemplateService {
     /**
      * 将原来全局字段与模板的关联
      * 改为项目下字段与模板的关联
+     *
      * @param customField
      * @param templateIds
      * @return
      */
     public int updateProjectTemplateGlobalField(CustomFieldDao customField, List<String> templateIds) {
         if (CollectionUtils.isEmpty(templateIds)) {
-          return 0;
+            return 0;
         }
         CustomFieldTemplateExample example = new CustomFieldTemplateExample();
         example.createCriteria()
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index c50a4aeef0..56db6e2425 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -488,7 +488,7 @@ export default {
         }
       }
       // 通知过来的数据跳转到编辑
-      if (this.routeParamObj.caseId) {
+      if (routeParamObj.caseId) {
         this.activeDom = 'middle';
       }
     }