From 53ccc5a913d143bf65baab0a29ca54b84b2340c8 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 19 Jul 2022 17:31:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E5=8F=8A=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20FBGYWBD=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=E5=8F=91=E5=B8=83=E7=A8=BF(=E8=AF=91?=
 =?UTF-8?q?=E6=96=87)=20=E5=85=A5=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActSarItemsEOService.java         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
index a279368a..76d48958 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
@@ -852,6 +852,25 @@ public class ActSarItemsEOService {
                     addAttInfoMap.put("FBGBJBD",fileStr);
                 }
             }
+        }else if(oldAttInfoMap.containsKey("FBGYWBD")){
+            String fileStr = (String) oldAttInfoMap.get("FBGYWBD");
+            if(StringUtils.isNotBlank(fileStr)){
+                String newFileStr =addAttInfoMap.containsKey("FBGYWBD")?(String)addAttInfoMap.get("FBGYWBD"):null;
+                if(StringUtils.isNotBlank(newFileStr)){
+                    String[] fileSplit = fileStr.split(",");
+                    String[] newFileSplit = newFileStr.split(",");
+                    Set<String> fileSet = new HashSet<>();
+                    for(String sData:fileSplit){
+                        fileSet.add(sData);
+                    }
+                    for(String sData:newFileSplit){
+                        fileSet.add(sData);
+                    }
+                    addAttInfoMap.put("FBGYWBD",StringUtils.join(fileSet.toArray(), ","));
+                }else{
+                    addAttInfoMap.put("FBGYWBD",fileStr);
+                }
+            }
         }
     }