FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!558
This commit is contained in:
super_liu
2022-07-19 18:08:03 +08:00
parent 5a647b7a57 17dd917d1e
commit 4d72c4f90c
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+19
View File
@@ -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);
}
}
}
}