初始化

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -324,7 +324,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if(userOrderAuthorDiyList !=null && userOrderAuthorDiyList.size()>0){
             List<Long> diyauthList=userOrderAuthorDiyList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
             List<SysUserOrderAuthor> diyrole=sysUserOrderAuthorMapper.selectByParentId(diyauthList);
-            userOrderAuthorDiyList.addAll(diyrole);
+            if(diyrole !=null && diyrole.size()>0){
+                userOrderAuthorDiyList.addAll(diyrole);
+            }
         }
 
         //division
@@ -333,35 +335,45 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if(userOrderAuthorBMDList !=null && userOrderAuthorBMDList.size()>0){
         List<Long> BMdAuthList=userOrderAuthorBMDList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> BMdRole=sysUserOrderAuthorMapper.selectByParentId(BMdAuthList);
-        userOrderAuthorBMDList.addAll(BMdRole);
+            if(BMdRole !=null && BMdRole.size()>0){
+                userOrderAuthorBMDList.addAll(BMdRole);
+            }
         }
         //12北-NVB2023T01
         List<SysUserOrderAuthor> userOrderAuthor12bList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T01");
         if(userOrderAuthor12bList !=null && userOrderAuthor12bList.size()>0){
         List<Long> b12AuthList=userOrderAuthor12bList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> b12Role=sysUserOrderAuthorMapper.selectByParentId(b12AuthList);
-        userOrderAuthor12bList.addAll(b12Role);
+            if(b12Role !=null && b12Role.size()>0){
+                userOrderAuthor12bList.addAll(b12Role);
+            }
         }
         //12南-NVB2023T02
         List<SysUserOrderAuthor> userOrderAuthor12nList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T02");
         if(userOrderAuthor12nList !=null && userOrderAuthor12nList.size()>0){
         List<Long> n12AuthList=userOrderAuthor12nList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> n12Role=sysUserOrderAuthorMapper.selectByParentId(n12AuthList);
-        userOrderAuthor12nList.addAll(n12Role);
+            if(n12Role !=null && n12Role.size()>0){
+                userOrderAuthor12nList.addAll(n12Role);
+            }
         }
         //12中-NVB2023T03
         List<SysUserOrderAuthor> userOrderAuthor12zList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T03");
         if(userOrderAuthor12zList !=null && userOrderAuthor12zList.size()>0){
         List<Long> z12AuthList=userOrderAuthor12zList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> z12Role=sysUserOrderAuthorMapper.selectByParentId(z12AuthList);
-        userOrderAuthor12zList.addAll(z12Role);
+            if(z12Role !=null && z12Role.size()>0){
+                userOrderAuthor12zList.addAll(z12Role);
+            }
         }
         //36城-NVB2023T04
         List<SysUserOrderAuthor> userOrderAuthor36List = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T04");
         if(userOrderAuthor36List !=null && userOrderAuthor36List.size()>0){
         List<Long> c36AuthList=userOrderAuthor36List.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> c36Role=sysUserOrderAuthorMapper.selectByParentId(c36AuthList);
-        userOrderAuthor36List.addAll(c36Role);
+            if(c36Role !=null && c36Role.size()>0){
+                userOrderAuthor36List.addAll(c36Role);
+            }
         }
         //cw
        /* List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
@@ -373,14 +385,18 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if(userOrderAuthorYSLList !=null && userOrderAuthorYSLList.size()>0){
         List<Long> yslauthList=userOrderAuthorYSLList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
         List<SysUserOrderAuthor> yslrole=sysUserOrderAuthorMapper.selectByParentId(yslauthList);
-        userOrderAuthorYSLList.addAll(yslrole);
+            if(yslrole !=null && yslrole.size()>0){
+                userOrderAuthorYSLList.addAll(yslrole);
+            }
         }
         //xls
         List<SysUserOrderAuthor> userOrderAuthorXlsList = sysUserOrderAuthorMapper.selectAuthorIdByCode("XLS",null);
         if(userOrderAuthorXlsList !=null && userOrderAuthorXlsList.size()>0){
             List<Long> xlsAuthList=userOrderAuthorXlsList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
             List<SysUserOrderAuthor> xlsRole=sysUserOrderAuthorMapper.selectByParentId(xlsAuthList);
-            userOrderAuthorXlsList.addAll(xlsRole);
+            if(xlsRole !=null && xlsRole.size()>0){
+                 userOrderAuthorXlsList.addAll(xlsRole);
+            }
         }
 
         userExtMapper.selectUserExtList().forEach(sysUserExt -> {