Merge branch 'fix-main-ch' into 'main'

避免最初dictory中没有生产科时无法在创建生产科用户的同时创建生产科daodictory中 See merge request !8

Merge branch 'fix-main-ch' into 'main'
避免最初dictory中没有生产科时无法在创建生产科用户的同时创建生产科daodictory中 See merge request !8
chwork
2 parents da6a1823 7803cc94
Showing 1 changed file with 21 additions and 10 deletions
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
@@ -218,16 +218,27 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
       List<DictionaryDO> dictionaryDOList = dictionaryService.list(new LambdaQueryWrapper<DictionaryDO>()
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                     .eq(DictionaryDO::getDictName,RoleEnum.PRODUCE_USER.getName()));
-            if(CollectionUtils.isNotEmpty(dictionaryDOList) && !dictionaryDOList.contains(adminUserVO.getNickName())){
-                DictionaryVO dictionaryVO = new DictionaryVO();
-                dictionaryVO.setRemark("生产科");
-                dictionaryVO.setDictCode("productionDepartment");
-                dictionaryVO.setDictName("生产科");
-                dictionaryVO.setDictValue(adminUserVO.getNickName());
-                int count = dictionaryService.count();
-                dictionaryVO.setSort(count+1);
-                dictionaryService.add(dictionaryVO);
-            }
+      if(CollectionUtils.isNotEmpty(dictionaryDOList)){
+          Set<String> dictionaryNames = dictionaryDOList.stream().map(DictionaryDO::getDictName).collect(Collectors.toSet());
+          if(!dictionaryNames.contains(adminUserVO.getNickName())){
+              DictionaryVO dictionaryVO = new DictionaryVO();
+              dictionaryVO.setRemark("生产科");
+              dictionaryVO.setDictCode("productionDepartment");
+              dictionaryVO.setDictName("生产科");
+              dictionaryVO.setDictValue(adminUserVO.getNickName());
+              int count = dictionaryService.count();
+              dictionaryVO.setSort(count+1);
+              dictionaryService.add(dictionaryVO);
+          }
+      }
+            DictionaryVO dictionaryVO = new DictionaryVO();
+            dictionaryVO.setRemark("生产科");
+            dictionaryVO.setDictCode("productionDepartment");
+            dictionaryVO.setDictName("生产科");
+            dictionaryVO.setDictValue(adminUserVO.getNickName());
+            int count = dictionaryService.count();
+            dictionaryVO.setSort(count+1);
+            dictionaryService.add(dictionaryVO);
         }
         return ServerResult.success();
     }