‘linchangsheng’ 9 months ago
parent
commit
6a3c8d8f2a

+ 1 - 1
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 List<AdminWebsit> adminWebsit;
+    private AdminWebsit adminWebsit;
     private List<AdminDept> adminDept;
 
     @ApiModelProperty("部门id")

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

@@ -28,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -159,7 +161,9 @@ public class AdminCompanyWechatLogic {
         adminWebsit2.insert();
 
         //添加企业用户
-        adminUserAddReqBean.setAdminWebsitId(adminWebsit.getWebsitId());
+        List<String> websitIds = new ArrayList<>();
+        websitIds.add(adminWebsit.getWebsitId());
+        adminUserAddReqBean.setAdminWebsitId(websitIds);
         adminUserLogic.add(adminUserAddReqBean,true);
         //初始化模板
         adminCompanyWechatTemplateLogic.initCompanyWechatTemplate(adminCompanyWechat.getCompanyWechatId(), adminCompanyWechat.getCompanyName());

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

@@ -322,7 +322,7 @@ public class AdminUserLogic {
 //            throw new RemoteServiceException("无法为用户赋予与自身级别相当的角色");
 //        }
         //当前用户选择的部门
-        if (!StringUtil.isEmpty(newUser.getAdminWebsitId())) {
+/*        if (!CollectionUtils.isEmpty(newUser.getAdminWebsitId())) {
             AdminWebsit adminWebsit = adminWebsitService.getById(newUser.getAdminWebsitId());
             if (adminWebsit == null) {
                 throw new RemoteServiceException("请选择部门");
@@ -363,7 +363,7 @@ public class AdminUserLogic {
 
             newUser.setType(0);
             }
-        }
+        }*/
 
 
         newUser.setRoleName(addUserRole.getName());