需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -15,7 +15,7 @@ import java.util.List;
 public class AdminUserCom extends AdminUser {
 
 
-    private AdminWebsit adminWebsit;
+    private List<AdminWebsit> adminWebsit;
     private List<AdminDept> adminDept;
 
     @ApiModelProperty("部门id")

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

@@ -160,8 +160,6 @@ public class CommonLogic {
         //所有帐号
        // 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());
@@ -179,7 +177,10 @@ public class CommonLogic {
             adminUserCom.setCompanyWechatIds(companyWechatIds);
             adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList()));
             adminUserCom.setOnlyRead(companyWechatIds.size() > 1);
-            adminUserCom.setAdminWebsit(adminWebsit);
+
+
+            List<AdminWebsit> adminWebsitList = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, websitList.get(0).getAdminWebsitId()).list();
+            adminUserCom.setAdminWebsit(adminWebsitList);
             //获取当前登录人的企业微信配置
             AdminCompanyWechat adminCompanyWechatA = this.getAdminCompanyWechat(companyWechatIds.get(0));
             adminUserCom.setAdminCompanyWechat(adminCompanyWechatA);
@@ -237,7 +238,7 @@ public class CommonLogic {
             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);