‘linchangsheng’ vor 11 Monaten
Ursprung
Commit
5ff47b84ab

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminUserAddReqBean.java

@@ -12,9 +12,9 @@ import java.util.List;
 @ApiModel(value="AdminUserAddBean对象", description="新增用户对象")
 public class AdminUserAddReqBean extends AdminUser {
 
-    @ApiModelProperty("网点部门id")
+    @ApiModelProperty("网点id")
     private String adminWebsitId;
 
-    @ApiModelProperty("选择得部门")
+    @ApiModelProperty("选择得部门id")
     private String adminDeptId;
 }

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

@@ -122,7 +122,9 @@ public class CommonLogic {
             adminUserCom.setJoinCode(adminCompanyWechat.getJoinCode());
 
             AdminUserDeptRela adminUserDeptRela = adminUserDeptRelaService.lambdaQuery().eq(AdminUserDeptRela::getAdminUserId, admin.getAdminUserId()).last("limit 1").one();
-            adminUserCom.setAdminDept(adminDeptService.getById(adminUserDeptRela.getAdminDeptId()));
+            if (adminUserDeptRela != null) {
+                adminUserCom.setAdminDept(adminDeptService.getById(adminUserDeptRela.getAdminDeptId()));
+            }
 
             return adminUserCom;
         }