‘linchangsheng’ преди 9 месеца
родител
ревизия
68c4332566
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

+ 2 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -565,7 +565,8 @@ public class AdminUserLogic {
                         .in(AdminDeptWebsit::getAdminDeptId,deptIds).list();
 
                 List<String> collect = adminDeptWebsitList.stream().map(AdminDeptWebsit::getWebsitId).collect(Collectors.toList());
-                collect.addAll(adminUserBean.getAdminWebsitId());
+                if (!CollectionUtils.isEmpty(adminUserBean.getAdminWebsitId()))
+                    collect.addAll(adminUserBean.getAdminWebsitId());
                 adminUserBean.setAdminWebsitIds(collect);
             }