Merge remote-tracking branch 'origin/develop' into develop

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

@@ -759,6 +759,11 @@ public class AdminUserLogic {
                 adminUserBean.setAdminWebsitIds(adminUserBean.getAdminWebsitId());
             }
 
+            if (!adminUserBean.getUserName().equals("admin")
+                    && CollectionUtil.isEmpty(adminUserBean.getAdminWebsitIds())) {
+                throw new RemoteServiceException("账号未配置关联网点或部门里网点为空");
+            }
+
             List<AdminWebsit> adminWebsitList = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, adminUserBean.getAdminWebsitIds()).list();
 
             adminUserBean.setAdminWebsits(adminWebsitList);

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -554,10 +554,10 @@ public class AdminWebsitLogic {
                         .eq(AdminUserWebsitRela::getAdminWebsitId, id)
                         .list();
 
-                adminUserService.lambdaUpdate()
-                        .eq(AdminUser::getCompanyWechatId, adminWebsit.getCompanyWechatId())
-                        .in(AdminUser::getAdminUserId, relaList.stream().map(AdminUserWebsitRela::getAdminUserId).collect(Collectors.toList()))
-                        .remove();
+//                adminUserService.lambdaUpdate()
+//                        .eq(AdminUser::getCompanyWechatId, adminWebsit.getCompanyWechatId())
+//                        .in(AdminUser::getAdminUserId, relaList.stream().map(AdminUserWebsitRela::getAdminUserId).collect(Collectors.toList()))
+//                        .remove();
 
                 adminUserWebsitRelaService.lambdaUpdate()
                         .eq(AdminUserWebsitRela::getCompanyWechatId, adminWebsit.getCompanyWechatId())