Merge branch 'develop_migration' into 'develop_master'

Develop migration See merge request LiuChao/foton-slrs-system-rest!411
2022-03-07 17:34:18 +08:00
parent 262ed6f777 69c2d4c6e2
commit 73c31e34b2
8 changed files with 277 additions and 7 deletions
@@ -98,7 +98,12 @@ public class SysInfoEOService {
        String names = "";
        if (StringUtils.isNotBlank(codes)) {
            String[] idArr = codes.split(",");
-            names = dicTypeEODao.getDicNamesByCodes(Arrays.asList(idArr));
+            String names1 = dicTypeEODao.getDicNamesByCodes(Arrays.asList(idArr));
+            if(StringUtils.isNotBlank(names1) && names1.contains(",")){
+                List<String> list1 = Arrays.asList(names1.split(","));
+                List<String> list = list1.stream().distinct().collect(Collectors.toList());
+                names = String.join(",",list);
+            }
        }
        return names;
    }