zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:用户部分代码完善

main
dearLin 2025-11-04 09:27:13 +08:00
parent d35cc35a03
commit 314c4929ad
4 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web-adapter/src/main/java/com/zcloud/basic/info/web/SysUserController.java
View File

@ -78,6 +78,9 @@ public class SysUserController {
Map<String, String> 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("监测到角色名称重复，请联系管理员。");

2
web-app/src/main/java/com/zcloud/basic/info/command/SysUserAddExe.java
View File

@ -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);
}

6
web-client/src/main/java/com/zcloud/basic/info/dto/SysCorpUserAddCmd.java
View File

@ -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相关方不能为空")

49
web-client/src/main/java/com/zcloud/basic/info/dto/SysUserAddCmd.java
View File

@ -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;
}