|
@@ -3,9 +3,11 @@ package com.persagy.fm.person.model.dto;
|
|
import com.persagy.fm.common.constant.RegexConstants;
|
|
import com.persagy.fm.common.constant.RegexConstants;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
|
|
+import net.minidev.json.annotate.JsonIgnore;
|
|
import org.hibernate.validator.constraints.Length;
|
|
import org.hibernate.validator.constraints.Length;
|
|
|
|
|
|
import javax.validation.constraints.Email;
|
|
import javax.validation.constraints.Email;
|
|
|
|
+import javax.validation.constraints.NotEmpty;
|
|
import javax.validation.constraints.NotNull;
|
|
import javax.validation.constraints.NotNull;
|
|
import javax.validation.constraints.Pattern;
|
|
import javax.validation.constraints.Pattern;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -60,11 +62,11 @@ public class UpsertPersonDTO {
|
|
@ApiModelProperty(value = "备注")
|
|
@ApiModelProperty(value = "备注")
|
|
private String remark;
|
|
private String remark;
|
|
|
|
|
|
- @NotNull(message = "部门不能为空")
|
|
|
|
|
|
+ @NotEmpty(message = "部门不能为空")
|
|
@ApiModelProperty(value = "所属部门id", required = true)
|
|
@ApiModelProperty(value = "所属部门id", required = true)
|
|
private List<String> depIds;
|
|
private List<String> depIds;
|
|
|
|
|
|
- @NotNull(message = "项目权限不能为空")
|
|
|
|
|
|
+ @NotEmpty(message = "项目权限不能为空")
|
|
@ApiModelProperty(value = "关联的项目id", required = true)
|
|
@ApiModelProperty(value = "关联的项目id", required = true)
|
|
private List<String> projectIds;
|
|
private List<String> projectIds;
|
|
|
|
|
|
@@ -92,9 +94,11 @@ public class UpsertPersonDTO {
|
|
@ApiModelProperty("登录权限(年.月.日)")
|
|
@ApiModelProperty("登录权限(年.月.日)")
|
|
private Date expireDate;
|
|
private Date expireDate;
|
|
|
|
|
|
- @ApiModelProperty(value = "账号来源", required = true)
|
|
|
|
|
|
+ @ApiModelProperty(value = "账号来源")
|
|
|
|
+ @JsonIgnore
|
|
private String userFrom;
|
|
private String userFrom;
|
|
|
|
|
|
@ApiModelProperty("账号id")
|
|
@ApiModelProperty("账号id")
|
|
|
|
+ @JsonIgnore
|
|
private String accountId;
|
|
private String accountId;
|
|
}
|
|
}
|