From d6c3dc4a2937e2c2f0fd34e36934f4b6ed146ce1 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 18 Mar 2022 17:52:33 +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=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E4=B8=8D?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 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 3de8336ee..bcc3ef858 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
@@ -477,6 +477,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //处理被代替标准和对应标准
         List<String> replaceStandardNameList = new ArrayList<>();//代替标准
         List<String> replacedStandardNameList = new ArrayList<>();//被代替标准
+        List<String> replacedStandardIdList = new ArrayList<>();//被代替标准
         List<String> correspondingStandardNameList = new ArrayList<>();//对应标准
         for (Map<String, Object> map : mapList) {
             //对应标准处理
@@ -531,6 +532,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
                 String serialNumber = (String) map.get("serial_number");
                 replacedStandardNameList.add(serialNumber);
+                replacedStandardIdList.add((String) map.get("id"));
             }
         }
         //对应标准中文
@@ -540,6 +542,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //        }
 //        if (replacedStandardNameList.size() != 0) {
         dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
+//        dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ","));
 //        }
 //        if (replaceStandardNameList.size() != 0) {
         dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
@@ -1073,7 +1076,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         //被代替标准
                         for (Map<String, Object> stringObjectMap : mapList) {
                             String replaceStandard = (String) stringObjectMap.get("replace_standard");
-                            if(replaceStandard.contains((String)entry.getValue())){
+                            if(StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains((String)entry.getValue())){
                                 standSb.append(stringObjectMap.get("serial_number")+",");
                             }
                         }
@@ -1094,8 +1097,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         }
                     }
 
-                    String substring = standSb.substring(0, standSb.length() - 1);
-                    sb.append(onlCgformField.getDbFieldTxt()+":"+substring+" ");
+                    if(StringUtils.isNotBlank(standSb)){
+                        String substring = standSb.substring(0, standSb.length() - 1);
+                        sb.append(onlCgformField.getDbFieldTxt()+":"+substring+" ");
+                    }
                 }
             }
 
@@ -1460,16 +1465,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                         valueTemp = getReplaceStandardName(valueTemp);
                                     }
                                 }
-                                //其他类型
-                                if (ObjectUtils.isNotEmpty(value)) {
-                                    if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
-                                        sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
-                                    } else if (ObjectUtils.isEmpty(valueTemp)) {
-                                        sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
-                                    }
-                                } else {
-                                    if (ObjectUtils.isNotEmpty(valueTemp)) {
-                                        sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
+                                //其他类型(被代替标准不处理)
+                                if(!"replaced_standard".equals(key)){
+                                    if (ObjectUtils.isNotEmpty(value)) {
+                                        if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
+                                            sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
+                                        } else if (ObjectUtils.isEmpty(valueTemp)) {
+                                            sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
+                                        }
+                                    } else {
+                                        if (ObjectUtils.isNotEmpty(valueTemp)) {
+                                            sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
+                                        }
                                     }
                                 }
                             }