From 65335dc8db8b3237649f656923ecada4c7013f7d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 30 Mar 2022 19:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/document/enums/FieldTypeEnum.java |  3 +-
 .../BussDocumentLibraryEOServiceImpl.java     | 42 ++++++++++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java
index 885b25b39..f37650cef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java
@@ -22,7 +22,8 @@ public enum FieldTypeEnum {
     FILE("文件","7"),
     TEXT("文本框","8"),
     PERSON("人员选择","9"),
-    STANDARD("标准选择","10");
+    STANDARD("标准选择","10"),
+    TEXT_LINK("输入框(链接)","11");
 
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 4fe6bcf40..511a21724 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -265,27 +265,36 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String correspondingStandardStr = "";
             String replaceStandardStr = "";
             if(StringUtils.isNotBlank(correspondingStandard)){
-                for (String s : correspondingStandard.split(",")) {
-                    if(!ids.contains(s)){
-                        correspondingStandardSb.append(s+",");
+                if(!correspondingStandard.contains(",")){
+                    if(!ids.contains(correspondingStandard)){
+                        correspondingStandardStr = correspondingStandard;
+                    }
+                }else{
+                    for (String s : correspondingStandard.split(",")) {
+                        if(!ids.contains(s)){
+                            correspondingStandardSb.append(s+",");
+                        }
                     }
                 }
                 if(StringUtils.isNotBlank(correspondingStandardSb)){
                     correspondingStandardStr = correspondingStandardSb.substring(0, correspondingStandardSb.length() - 1);
-                }else{
-                    correspondingStandardStr = correspondingStandard;
                 }
             }
             if(StringUtils.isNotBlank(replaceStandard)){
-                for (String s : replaceStandard.split(",")) {
-                    if(!ids.contains(s)){
-                        replaceStandardSb.append(s+",");
+                if(!replaceStandard.contains(",")){
+                    if(!ids.contains(replaceStandard)){
+                        replaceStandardStr = replaceStandard;
+                    }
+                }else{
+                    for (String s : replaceStandard.split(",")) {
+                        if(!ids.contains(s)){
+                            replaceStandardSb.append(s+",");
+                        }
                     }
                 }
+
                 if(StringUtils.isNotBlank(replaceStandardSb)){
                     replaceStandardStr = replaceStandardSb.substring(0, replaceStandardSb.length() - 1);
-                }else{
-                    replaceStandardStr = replaceStandard;
                 }
             }
             bussDocumentLibraryEOMapper.updateByDeleteId(correspondingStandardStr,replaceStandardStr,id);
@@ -836,6 +845,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<OnlCgformField> treeFieldList = fieldList.stream()
                 .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
                 .collect(Collectors.toList());
+        //过滤出输入框链接
+        List<OnlCgformField> OnlCgformFieldLinkList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+                .collect(Collectors.toList());
+        List<String> linkList = OnlCgformFieldLinkList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+
         //下拉选字段
         List<String> fieldPullList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
 
@@ -954,7 +969,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             }
                         });
                     }
-                    mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
+                    mapPut(cut, map, "field_show_type",
+                            onlCgformField.getFieldShowType(), "dict_field",
+                            onlCgformField.getDictField(), "db_field_name",
+                            onlCgformField.getDbFieldName(), "db_field_txt",
+                            onlCgformField.getDbFieldTxt(), "db_field_en_name",
+                            onlCgformField.getDbFieldEnName(), "area", areaName, null);
                 }
                 if (map.size() != 0) {
                     resultTemp.add(map);