From 5160eb738724fd2f52e6581727a619f5fc0a0a6d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 11 Mar 2022 14:43:31 +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=97=B6=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E6=A0=87=E5=87=86=E5=92=8C=E4=BB=A3=E6=9B=BF=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 60 +++++++++++++++++--
 1 file changed, 56 insertions(+), 4 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 25cae88ac..eca57a871 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
@@ -391,7 +391,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         queryWrapper.eq(BussDocumentLibraryEO::getId, id);
         //通过id查询数据
         List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
-        ;
         //查询所有
         List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
         //对应标准id
@@ -409,7 +408,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     if (s.equals((String) map.get("id"))) {
                         correspondingStandardNameList.add((String) map.get("serial_number"));
                     } else {
-                        correspondingStandardNameList.add(s);
+                        boolean flag = isId(s);
+                        if(!flag && !correspondingStandardNameList.contains(s)){
+                            correspondingStandardNameList.add(s);
+                        }
+                    }
+                }
+            }else{
+                //处理已删除的文档的对应标准
+                if(StringUtils.isNotBlank(correspondingStandard)){
+                    for (String s : correspondingStandard.split(",")) {
+                        boolean flag = isId(s);
+                        if(!flag && !correspondingStandardNameList.contains(s)){
+                            correspondingStandardNameList.add(s);
+                        }
                     }
                 }
             }
@@ -419,11 +431,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     if (s.equals((String) map.get("id"))) {
                         replaceStandardNameList.add((String) map.get("serial_number"));
                     } else {
-                        replaceStandardNameList.add(s);
+                        boolean flag = isId(s);
+                        if(!flag && !replaceStandardNameList.contains(s)){
+                            replaceStandardNameList.add(s);
+                        }
+                    }
+                }
+            }else{
+                //处理已删除的代替标准
+                if(StringUtils.isNotBlank(replaceStandardTemp)){
+                    for (String s : replaceStandardTemp.split(",")) {
+                        boolean flag = isId(s);
+                        if(!flag && !replaceStandardNameList.contains(s)){
+                            replaceStandardNameList.add(s);
+                        }
                     }
                 }
-            }
 
+            }
             //被代替标准
             String replaceStandard = (String) map.get("replace_standard");
             if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
@@ -2895,4 +2920,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         return bussDocumentLibraryEOMapper.getListBySerialNumber(serialNumbers);
     }
 
+    /**
+     * 验证字符串是不是id
+     * @param s
+     * @return
+     */
+    public boolean isId(String s){
+        if(StringUtils.isBlank(s)){
+            return false;
+        }
+        if(s.length() ==32){
+            String sub1 = s.substring(0, 8);
+            String sub2 = s.substring(8, 12);
+            String sub3 = s.substring(12, 16);
+            String sub4 = s.substring(16, 20);
+            String sub5 = s.substring(20, 32);
+            String id = sub1 + "-" + sub2 + "-" + sub3 + "-" + sub4 + "-" + sub5;
+            try {
+                UUID uuid = UUID.fromString(id);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        }else{
+            return false;
+        }
+    }
+
 }