diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 8affa68d..367f9721 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -951,22 +951,22 @@ public class BmsSupplierController { List userCodes = new ArrayList<>(); userCodes.addAll( saveList.stream().filter(a->StringUtils.hasText(a.getMainHeadCode())) - .map(a->Arrays.asList(a.getMainHeadCode().split(","))) + .map(a->Arrays.asList(a.getMainHeadCode().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes.addAll( saveList.stream().filter(a->StringUtils.hasText(a.getMinorHeadCodes())) - .map(a->Arrays.asList(a.getMinorHeadCodes().split(","))) + .map(a->Arrays.asList(a.getMinorHeadCodes().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes.addAll( updateList.stream().filter(a->StringUtils.hasText(a.getMainHeadCode())) - .map(a->Arrays.asList(a.getMainHeadCode().split(","))) + .map(a->Arrays.asList(a.getMainHeadCode().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes.addAll( updateList.stream().filter(a->StringUtils.hasText(a.getMinorHeadCodes())) - .map(a->Arrays.asList(a.getMinorHeadCodes().split(","))) + .map(a->Arrays.asList(a.getMinorHeadCodes().split(";"))) .flatMap(List::stream).collect(Collectors.toList()) ); userCodes = userCodes.stream().distinct().collect(Collectors.toList()); @@ -986,10 +986,10 @@ public class BmsSupplierController { } List userCodeTemp = new ArrayList<>(); if(StringUtils.hasText(a.getMainHeadCode())){ - userCodeTemp.addAll(Arrays.asList(a.getMainHeadCode().split(","))); + userCodeTemp.addAll(Arrays.asList(a.getMainHeadCode().split(";"))); } if(StringUtils.hasText(a.getMinorHeadCodes())){ - userCodeTemp.addAll(Arrays.asList(a.getMinorHeadCodes().split(","))); + userCodeTemp.addAll(Arrays.asList(a.getMinorHeadCodes().split(";"))); } List noExistUserCode = userCodeTemp.stream().filter(b->!exsitUserCodes.contains(b)).collect(Collectors.toList()); if(noExistUserCode.size()>0){ @@ -1105,7 +1105,7 @@ public class BmsSupplierController { } if(StringUtils.hasText(a.getMinorHeadCodes())){ - List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(",")); + List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(";")); List otherUserNames = new ArrayList<>(); List otherUserIds = new ArrayList<>(); otherUserCodes.forEach(b->{ @@ -1168,7 +1168,7 @@ public class BmsSupplierController { } if(StringUtils.hasText(a.getMinorHeadCodes())){ - List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(",")); + List otherUserCodes = Arrays.asList(a.getMinorHeadCodes().split(";")); List otherUserNames = new ArrayList<>(); List otherUserIds = new ArrayList<>(); otherUserCodes.forEach(b->{