‘linchangsheng’ 7 meses atrás
pai
commit
b46cdbb483

+ 5 - 1
mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserBean.java

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.bean.admin;
 
 import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -48,8 +49,11 @@ public class AdminUserBean extends AdminUser {
     @ApiModelProperty("部门id")
     private List<String> adminDeptId;
 
-    @ApiModelProperty("部门ids")
+    @ApiModelProperty("网点ids")
     private List<String> adminWebsitIds;
+
+    @ApiModelProperty("网点对象")
+    private List<AdminWebsit> adminWebsits;
     @ApiModelProperty("使用小程序模板类型:  1=模板1 2=模板2")
     private Integer useTemplate;
 

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

@@ -758,6 +758,10 @@ public class AdminUserLogic {
                 adminUserBean.setAdminWebsitIds(adminUserBean.getAdminWebsitId());
             }
 
+            List<AdminWebsit> adminWebsitList = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, adminUserBean.getAdminWebsitIds()).list();
+
+            adminUserBean.setAdminWebsits(adminWebsitList);
+
 
             return adminUserBean;
         }