判断

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

@@ -321,35 +321,48 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         List<SysUserAuthorRel> roleAuth = new ArrayList<>();
         //diy
         List<SysUserOrderAuthor> userOrderAuthorDiyList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy",null);
-        List<Long> diyauthList=userOrderAuthorDiyList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
-        List<SysUserOrderAuthor> diyrole=sysUserOrderAuthorMapper.selectByParentId(diyauthList);
-        userOrderAuthorDiyList.addAll(diyrole);
+        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);
+        }
+
         //division
         //BMD-NVB2023T05
         List<SysUserOrderAuthor> userOrderAuthorBMDList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy","NVB2023T05");
+        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);
+        }
         //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);
+        }
         //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);
+        }
         //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);
+        }
         //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);
+        }
         //cw
        /* List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
         List<Long> cwauthList=userOrderAuthorCwList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
@@ -357,9 +370,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         userOrderAuthorCwList.addAll(cwrole);*/
        //ysl
         List<SysUserOrderAuthor> userOrderAuthorYSLList = sysUserOrderAuthorMapper.selectAuthorIdByCode("YSL",null);
+        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);
+        }
 
         userExtMapper.selectUserExtList().forEach(sysUserExt -> {
             String sales = sysUserExt.getSalesLevel();
@@ -394,7 +409,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                     }
 
                 }
-            if(userOrderAuthorList.size()>0){
+            if(userOrderAuthorList !=null && userOrderAuthorList.size()>0){
                 userAuthorRelMapper.deleteSysUserAuthorRelById(sysUserExt.getUserId());
                 SysUserAuthorRel role = new SysUserAuthorRel();
                 role.setUserId(sysUserExt.getUserId());