需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/CommonLogic.java

@@ -158,7 +158,33 @@ public class CommonLogic {
 
 
         //所有帐号
-        adminUserCom = this.websitAccount(adminUserCom);
+       // adminUserCom = this.websitAccount(adminUserCom);
+
+
+
+        List<AdminUserWebsitRela> websitList = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, userId).list();
+        if(!CollectionUtils.isEmpty(websitList)){
+            List<String> adminWebsitIds = websitList.stream().map(AdminUserWebsitRela::getAdminWebsitId).distinct().collect(Collectors.toList());
+            List<String> companyWechatIds = websitList.stream().map(AdminUserWebsitRela::getCompanyWechatId).distinct().collect(Collectors.toList());
+
+            List<AdminWebsit> list = new ArrayList<>();
+            for(String websitId : adminWebsitIds) {
+                list.addAll(this.queryAllChild(list, websitId));
+            }
+            List<String> websitIds = list.stream().map(AdminWebsit::getWebsitId).distinct().collect(Collectors.toList());
+            websitIds.addAll(adminWebsitIds);
+
+
+            AdminWebsit adminWebsit = adminWebsitService.getById(websitList.get(0).getAdminWebsitId());
+            adminUserCom.setCompanyWechatIds(companyWechatIds);
+            adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList()));
+            adminUserCom.setOnlyRead(companyWechatIds.size() > 1);
+            adminUserCom.setAdminWebsit(adminWebsit);
+            //获取当前登录人的企业微信配置
+            AdminCompanyWechat adminCompanyWechatA = this.getAdminCompanyWechat(companyWechatIds.get(0));
+            adminUserCom.setAdminCompanyWechat(adminCompanyWechatA);
+        }
+
 
         if (!CollectionUtils.isEmpty(adminUserDeptRelaList)){
 
@@ -179,6 +205,7 @@ public class CommonLogic {
         }
 
 
+
         return adminUserCom;
     }
 
@@ -191,7 +218,7 @@ public class CommonLogic {
         if(adminUserCom.getType() != 2){
             List<AdminUserWebsitRela> websitList = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, userId).list();
             if(CollectionUtils.isEmpty(websitList)){
-                throw new RemoteServiceException("暂无授权,请联系管理员");
+                return adminUserCom;
             }
 
             List<String> adminWebsitIds = websitList.stream().map(AdminUserWebsitRela::getAdminWebsitId).distinct().collect(Collectors.toList());