From e80e7f02ba54acfdc18d82bf044fef7c81b71a1d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 11 Mar 2022 15:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?(=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86,=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=A0=87=E5=87=86,=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=A0=87?=
 =?UTF-8?q?=E5=87=86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 91 ++++++++++++++++---
 1 file changed, 76 insertions(+), 15 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 eca57a871..d022c254e 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
@@ -521,23 +521,84 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         //处理被代替标准和对应标准
         for (Map<String, Object> map : mapList) {
-            Map<String, Object> mapTemp = new HashMap<>();
+            Map<String,Object> stringObjectMap = new HashMap<>();
             //对应标准处理
             if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) {
-                correspondingStandardNameList.add((String) map.get("serial_number"));
-                mapTemp.put("title", (String) map.get("serial_number"));
-                mapTemp.put("id", (String) map.get("id"));
-                if (ObjectUtils.isNotEmpty(mapTemp)) {
-                    listCorrespondingStandard.add(mapTemp);
+                for (String s : correspondingStandardId.split(",")) {
+                    Map<String, Object> mapTemp = new HashMap<>();
+                    if(s.equals((String) map.get("id"))){
+                        correspondingStandardNameList.add((String) map.get("serial_number"));
+                        mapTemp.put("title", (String) map.get("serial_number"));
+                        mapTemp.put("id", (String) map.get("id"));
+                        if (ObjectUtils.isNotEmpty(mapTemp)) {
+                            listCorrespondingStandard.add(mapTemp);
+                        }
+                    }else{
+                        boolean flag = isId(s);
+                        if(!flag && !correspondingStandardNameList.contains(s)){
+                            correspondingStandardNameList.add(s);
+                            mapTemp.put("title", s);
+                            mapTemp.put("id", "");
+                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+                                listCorrespondingStandard.add(mapTemp);
+                            }
+                        }
+                    }
                 }
+            }else{
+                if(StringUtils.isNotBlank(correspondingStandardId)){
+                    for (String s : correspondingStandardId.split(",")) {
+                        Map<String, Object> mapTemp = new HashMap<>();
+                        boolean flag = isId(s);
+                        if(!flag && !correspondingStandardNameList.contains(s)){
+                            correspondingStandardNameList.add(s);
+                            mapTemp.put("title", s);
+                            mapTemp.put("id", "");
+                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+                                listCorrespondingStandard.add(mapTemp);
+                            }
+                        }
+                    }
+                }
+
             }
             //代替标准
             if (StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))) {
-                replaceStandardNameList.add((String) map.get("serial_number"));
-                mapTemp.put("title", (String) map.get("serial_number"));
-                mapTemp.put("id", (String) map.get("id"));
-                if (ObjectUtils.isNotEmpty(mapTemp)) {
-                    listReplaceStandard.add(mapTemp);
+                for (String s : replaceStandardId.split(",")) {
+                    Map<String, Object> mapTemp = new HashMap<>();
+                    if(s.equals((String) map.get("id"))){
+                        replaceStandardNameList.add((String) map.get("serial_number"));
+                        mapTemp.put("title", (String) map.get("serial_number"));
+                        mapTemp.put("id", (String) map.get("id"));
+                        if (ObjectUtils.isNotEmpty(mapTemp)) {
+                            listReplaceStandard.add(mapTemp);
+                        }
+                    }else{
+                        boolean flag = isId(s);
+                        if(!flag && !replaceStandardNameList.contains(s)){
+                            replaceStandardNameList.add(s);
+                            mapTemp.put("title", s);
+                            mapTemp.put("id", "");
+                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+                                listReplaceStandard.add(mapTemp);
+                            }
+                        }
+                    }
+                }
+            }else{
+                if(StringUtils.isNotBlank(replaceStandardId)){
+                    for (String s : replaceStandardId.split(",")) {
+                        Map<String, Object> mapTemp = new HashMap<>();
+                        boolean flag = isId(s);
+                        if(!flag && !replaceStandardNameList.contains(s)){
+                            replaceStandardNameList.add(s);
+                            mapTemp.put("title", s);
+                            mapTemp.put("id", "");
+                            if (ObjectUtils.isNotEmpty(mapTemp)) {
+                                listReplaceStandard.add(mapTemp);
+                            }
+                        }
+                    }
                 }
             }
             //被代替标准
@@ -546,10 +607,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 replacedStandardIdList.add((String) map.get("id"));
                 String serialNumber = (String) map.get("serial_number");
                 replacedStandardNameList.add(serialNumber);
-                mapTemp.put("title", (String) map.get("serial_number"));
-                mapTemp.put("id", (String) map.get("id"));
-                if (ObjectUtils.isNotEmpty(mapTemp)) {
-                    listReplacedStandard.add(mapTemp);
+                stringObjectMap.put("title", (String) map.get("serial_number"));
+                stringObjectMap.put("id", (String) map.get("id"));
+                if (ObjectUtils.isNotEmpty(stringObjectMap)) {
+                    listReplacedStandard.add(stringObjectMap);
                 }
             }
         }