需求

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

@@ -156,6 +156,10 @@ public class CommonLogic {
         List<AdminUserDeptRela> adminUserDeptRelaList = adminUserDeptRelaService.lambdaQuery()
                 .eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).list();
 
+
+        //所有帐号
+        adminUserCom = this.websitAccount(adminUserCom);
+
         if (!CollectionUtils.isEmpty(adminUserDeptRelaList)){
 
             List<String> deptids = adminUserDeptRelaList.stream().map(AdminUserDeptRela::getAdminDeptId).collect(Collectors.toList());
@@ -172,10 +176,9 @@ public class CommonLogic {
             }
 
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
-        }else {
-            //所有帐号
-            adminUserCom = this.websitAccount(adminUserCom);
         }
+
+
         return adminUserCom;
     }
 
@@ -203,11 +206,11 @@ public class CommonLogic {
             websitIds.addAll(adminWebsitIds);
 
 
-           // adminWebsitService.lambdaQuery().eq();
+            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);
+            adminUserCom.setAdminWebsit(adminWebsit);
             //获取当前登录人的企业微信配置
             AdminCompanyWechat adminCompanyWechat = this.getAdminCompanyWechat(companyWechatIds.get(0));
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);