dev:新增用户时手机号不能为空校验

web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java

@@ -56,6 +56,7 @@ public class UserAddCmd extends Command {
     private String email;
 
     @ApiModelProperty(value = "手机号", name = "phone")
+    @NotEmpty(message = "手机号不能为空")
     private String phone;
 
     @ApiModelProperty(value = "人员类型编码（主要负责人等）", name = "personnelType", required = true)
@@ -71,6 +72,7 @@ public class UserAddCmd extends Command {
     private String nationName;
 
     @ApiModelProperty(value = "身份证号", name = "userIdCard")
+    @NotEmpty(message = "身份证号不能为空")
     private String userIdCard;
 
     @ApiModelProperty(value = "人脸头像url", name = "userAvatarUrl")

web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java

@@ -49,8 +49,8 @@ public class UserEmploymentLogAddCmd extends Command {
     @NotEmpty(message = "岗位名称不能为空")
     private String postName;
 
-    @ApiModelProperty(value = "入职状态，1-入职 0-离职", name = "employmentFlag", required = true)
+    @ApiModelProperty(value = "入职状态，1-在职 0-离职", name = "employmentFlag", required = true)
-    @NotNull(message = "入职状态，1-入职 0-离职不能为空")
+    @NotNull(message = "入职状态，1-在职 0-离职不能为空")
     private Integer employmentFlag;
 
 }

web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java

@@ -48,8 +48,8 @@ public class UserEmploymentLogUpdateCmd extends Command {
     @ApiModelProperty(value = "岗位名称", name = "postName", required = true)
     @NotEmpty(message = "岗位名称不能为空")
     private String postName;
-    @ApiModelProperty(value = "入职状态，1-入职 0-离职", name = "employmentFlag", required = true)
+    @ApiModelProperty(value = "入职状态，1-在职 0-离职", name = "employmentFlag", required = true)
-    @NotNull(message = "入职状态，1-入职 0-离职不能为空")
+    @NotNull(message = "入职状态，1-在职 0-离职不能为空")
     private Integer employmentFlag;
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java

@@ -27,6 +27,7 @@ public class UserPageQry extends PageQuery {
     private Long eqCorpinfoId;
     private Long eqDepartmentId;
     private Long eqPostId;
+    private Long eqRoleId;
     private String likeName;
     private String likeUsername;
     private Integer allFlag;

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java

@@ -169,7 +169,7 @@ public class UserCO extends ClientObject {
     private String mappingPostName;
     private String mappingDeptName;
     // 入职状态
-    @ApiModelProperty(value = "入职状态")
+    @ApiModelProperty(value = "入职状态 1-在职 0-离职")
     private Integer employmentFlag;
 
 

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java

@@ -40,8 +40,8 @@ public class UserEmploymentLogCO extends ClientObject {
     //岗位名称
     @ApiModelProperty(value = "岗位名称")
     private String postName;
-    //入职状态，1-入职 0-离职
+    //入职状态，1-在职 0-离职
-    @ApiModelProperty(value = "入职状态，1-入职 0-离职")
+    @ApiModelProperty(value = "入职状态，1-在职 0-离职")
     private Integer employmentFlag;
     //是否删除
     @ApiModelProperty(value = "是否删除")

web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java

@@ -32,7 +32,7 @@ public class UserEmploymentLogE extends BaseE {
     private Long postId;
     //岗位名称
     private String postName;
-    //入职状态，1-入职 0-离职
+    //入职状态，1-在职 0-离职
     private Integer employmentFlag;
     //是否删除
     private String deleteEnum;

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java

@@ -42,8 +42,8 @@ public class UserEmploymentLogDO extends BaseDO {
     //岗位名称
     @ApiModelProperty(value = "岗位名称")
     private String postName;
-    //入职状态，1-入职 0-离职
+    //入职状态，1-在职 0-离职
-    @ApiModelProperty(value = "入职状态，1-入职 0-离职")
+    @ApiModelProperty(value = "入职状态，1-在职 0-离职")
     private Integer employmentFlag;
 
     public UserEmploymentLogDO(String userEmploymentLogId) {

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java

@@ -57,7 +57,7 @@ public class UserQualificationInfoDO extends BaseDO {
     @TableField(exist = false)
     private String userName;
 
-    @ApiModelProperty(value = "入职状态, 1-入职 0-离职")
+    @ApiModelProperty(value = "入职状态, 1-在职 0-离职")
     @TableField(exist = false)
     private String employmentFlagName;
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java

@@ -212,6 +212,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         if(userDO.getSort() == null){
             userDO.setSort(9999);
         }
+        // 新增用户默认在职
+        userDO.setEmploymentFlag(1);
         save(userDO);
     }