From 17acba2d4a31472a52e77bb66757648b1150f882 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 May 2022 15:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E7=BC=96=E8=BE=91--?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9=E7=B1=BB=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 60 ++++++++-----------
 1 file changed, 26 insertions(+), 34 deletions(-)

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 7e571f7b2..64ab6ab80 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
@@ -1635,34 +1635,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //字段属性
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //标准选择字段
-        List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
-                .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
-        if(standardOnlCgformFieldList.size() != 0){
-            List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
-            List<String> standardList = new ArrayList<>();
-            for (Map.Entry<String, Object> entry : map.entrySet()) {
-                String key = entry.getKey();
-                if(collect.contains(key)){
-                    standardList.add(key);
-                }
-            }
-            if(standardList.size() != 0){
-                for (String standard : standardList) {
-                    map.put(standard, map.get(standard+"_id"));
-                    map.remove(standard+"_id");
-                }
-            }
-        }
+//        List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+//        if(standardOnlCgformFieldList.size() != 0){
+//            List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//            List<String> standardList = new ArrayList<>();
+//            for (Map.Entry<String, Object> entry : map.entrySet()) {
+//                String key = entry.getKey();
+//                if(collect.contains(key)){
+//                    standardList.add(key);
+//                }
+//            }
+//            if(standardList.size() != 0){
+//                for (String standard : standardList) {
+//                    map.put(standard, map.get(standard+"_id"));
+//                    map.remove(standard+"_id");
+//                }
+//            }
+//        }
         String cut = (String) map.get("cut");
         map.remove("cut");
-//        if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
-//            map.put("replace_standard", map.get("replace_standard_id"));
-//        }
-//        if (ObjectUtils.isNotEmpty(map.get("corresponding_standard_id"))) {
-//            map.put("corresponding_standard", map.get("corresponding_standard_id"));
-//        }
-//        map.remove("replace_standard_id");
-//        map.remove("corresponding_standard_id");
         //获取搜索中心字段
         List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
         //时间类型字段
@@ -2210,14 +2202,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     }
                                 }
                             } else {
-                                if ("replace_standard".equals(key) || "corresponding_standard".equals(key)) {
-                                    if (ObjectUtils.isNotEmpty(value)) {
-                                        value = getReplaceStandardName(value);
-                                    }
-                                    if (ObjectUtils.isNotEmpty(valueTemp)) {
-                                        valueTemp = getReplaceStandardName(valueTemp);
-                                    }
-                                }
+//                                if ("replace_standard".equals(key) || "corresponding_standard".equals(key)) {
+//                                    if (ObjectUtils.isNotEmpty(value)) {
+//                                        value = getReplaceStandardName(value);
+//                                    }
+//                                    if (ObjectUtils.isNotEmpty(valueTemp)) {
+//                                        valueTemp = getReplaceStandardName(valueTemp);
+//                                    }
+//                                }
                                 //其他类型(被代替标准不处理)
                                 if (!"replaced_standard".equals(key)) {
                                     if (ObjectUtils.isNotEmpty(value)) {