From 314c4929adaedca87585f498868b5bb6c921f373 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Tue, 4 Nov 2025 09:27:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/SysUserController.java | 3 ++ .../basic/info/command/SysUserAddExe.java | 2 - .../basic/info/dto/SysCorpUserAddCmd.java | 6 +-- .../zcloud/basic/info/dto/SysUserAddCmd.java | 49 +++++++------------ 4 files changed, 23 insertions(+), 37 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java index 97d8529..6fb39f8 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java @@ -78,6 +78,9 @@ public class SysUserController { Map collect = data.stream().collect(Collectors.toMap(RoleCO::getRoleName, RoleCO::getRoleTypeEnum)); facadeUserAddCmd.setRoleTypeEnum("2".equals(cmd.getUserType()) ? collect.get("分公司主账号") : collect.get("相关方主账号")); // todo 新增用户 GBS不适配功能 + + // todo 新增二级租户 + } catch (Exception e) { // 有重复的角色名称 抛异常 联系管理员 throw new BizException("监测到角色名称重复，请联系管理员。"); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java index b24145f..d4e5042 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java @@ -50,8 +50,6 @@ public class SysUserAddExe { sysUserDO.setName(cmd.getName()); sysUserDO.setUsername(cmd.getName()); sysUserDO.setUserType(cmd.getUserType()); - sysUserDO.setCorpinfoId(cmd.getCorpinfoId()); - sysUserDO.setDepartmentId(cmd.getDepartmentId()); sysUserDO.setMainCorp(1); sysUserRepository.save(sysUserDO); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java index bc971ae..1840ca6 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java @@ -30,11 +30,9 @@ public class SysCorpUserAddCmd extends Command { @ApiModelProperty(value = "姓名", name = "name", required = true) @NotEmpty(message = "姓名不能为空") private String name; - @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) - @NotNull(message = "企业id不能为空") + // @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) private Long corpinfoId; - @ApiModelProperty(value = "部门id", name = "departmentId", required = true) - @NotNull(message = "部门id不能为空") + // @ApiModelProperty(value = "部门id", name = "departmentId", required = true) private Long departmentId; @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true) @NotEmpty(message = "1监管2企业3相关方不能为空") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java index 7119d37..75f77a9 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; /** @@ -24,21 +25,28 @@ public class SysUserAddCmd extends Command { @ApiModelProperty(value = "用户名", name = "username", required = true) @NotEmpty(message = "用户名不能为空") private String username; - @ApiModelProperty(value = "密码", name = "password", required = true) - @NotEmpty(message = "密码不能为空") - private String password; @ApiModelProperty(value = "姓名", name = "name", required = true) @NotEmpty(message = "姓名不能为空") private String name; - @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) - @NotEmpty(message = "企业不能为空") - private String corpinfoId; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) @NotEmpty(message = "部门id不能为空") private String departmentId; @ApiModelProperty(value = "角色id", name = "roleIds", required = true) @NotEmpty(message = "角色id不能为空") private String roleIds; + @ApiModelProperty(value = "岗位", name = "postId", required = true) + @NotNull(message = "岗位不能为空") + private Long postId; + @ApiModelProperty(value = "身份证号", name = "userIdCard", required = true) + @NotEmpty(message = "身份证号不能为空") + private String userIdCard; + @ApiModelProperty(value = "民族", name = "nation", required = true) + @NotEmpty(message = "民族不能为空") + private String nation; + @ApiModelProperty(value = "性别（0男1女）", name = "sex", required = true) + @NotEmpty(message = "性别（0男1女）不能为空") + private String sex; + @ApiModelProperty(value = "1监管2企业3相关方", name = "userType", required = true) @NotEmpty(message = "1监管2企业3相关方不能为空") private String userType; @@ -54,18 +62,11 @@ public class SysUserAddCmd extends Command { @ApiModelProperty(value = "电话", name = "phone", required = true) @NotEmpty(message = "电话不能为空") private String phone; - @ApiModelProperty(value = "性别（0男1女）", name = "sex", required = true) - @NotEmpty(message = "性别（0男1女）不能为空") - private String sex; - @ApiModelProperty(value = "民族", name = "nation", required = true) - @NotEmpty(message = "民族不能为空") - private String nation; + @ApiModelProperty(value = "政治面貌", name = "politicalOutlook", required = true) @NotEmpty(message = "政治面貌不能为空") private String politicalOutlook; - @ApiModelProperty(value = "身份证号", name = "userIdCard", required = true) - @NotEmpty(message = "身份证号不能为空") - private String userIdCard; + @ApiModelProperty(value = "出生年月", name = "dateOfBirth", required = true) @NotEmpty(message = "出生年月不能为空") private String dateOfBirth; @@ -111,24 +112,10 @@ public class SysUserAddCmd extends Command { @ApiModelProperty(value = "职称", name = "title", required = true) @NotEmpty(message = "职称不能为空") private String title; - @ApiModelProperty(value = "岗位", name = "postId", required = true) - @NotEmpty(message = "岗位不能为空") - private String postId; + @ApiModelProperty(value = "人员在部门中的排序", name = "sort", required = true) - @NotEmpty(message = "人员在部门中的排序不能为空") + @NotNull(message = "人员在部门中的排序不能为空") private Integer sort; - @ApiModelProperty(value = "所属省", name = "province", required = true) - @NotEmpty(message = "所属省不能为空") - private String province; - @ApiModelProperty(value = "所属市", name = "city", required = true) - @NotEmpty(message = "所属市不能为空") - private String city; - @ApiModelProperty(value = "所属区县", name = "country", required = true) - @NotEmpty(message = "所属区县不能为空") - private String country; - @ApiModelProperty(value = "所属乡镇", name = "village", required = true) - @NotEmpty(message = "所属乡镇不能为空") - private String village; private Long uid; }