From e38612bd0c14b89f393a18ebcee0bc5028f8889d Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 09 十二月 2025 16:44:32 +0800
Subject: [PATCH] 修改功能
---
multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java
index b23557b..60b888c 100644
--- a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java
+++ b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java
@@ -16,6 +16,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Set;
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
@@ -59,9 +60,7 @@
// @NotBlank(message = "手机号码不能为空")
// @Length(min = 11, max = 11, message = "手机号只能为11位")
// @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
- @ApiModelProperty(value = "手机号码",required = false)
- @TableField("phone")
- private String phone;
+
@ApiModelProperty("用户性别(0男，1女，2未知，默认2)")
@TableField("sex")
@@ -72,15 +71,23 @@
@TableField("age")
private Integer age;
- @ApiModelProperty(value = "人员类别1技术2管理",required = true)
- @NotNull(message = "人员类别1技术2管理")
+ @ApiModelProperty(value = "人员类别1技术2管理3行政4特殊作业",required = true)
+ @NotNull(message = "人员类别1技术2管理3行政")
@TableField("person_type")
private Integer personType;
- @NotBlank(message = "职称不能为空")
- @ApiModelProperty("职称")
- @TableField("positional")
- private String positional;
+ @ApiModelProperty(value = "是否内部人员0是1否",required = true)
+ @NotNull(message = "请选择是否内部人员")
+ @TableField("internal")
+ private Integer internal;
+
+ @ApiModelProperty(value = "手机号码",required = false)
+ @TableField("phone")
+ private String phone;
+
+ @ApiModelProperty("职务")
+ @TableField("duty")
+ private String duty;
@ApiModelProperty("父级账号id")
@TableField("parent_id")
@@ -91,7 +98,7 @@
private Long companyId;
@NotBlank(message = "密码不能为空")
- @Length(min = 2, message = "密码长度不正确")
+ @Length(min = 6, message = "密码长度不正确")
@ApiModelProperty(value = "密码",required = true)
@TableField("password")
private String password;
@@ -129,25 +136,14 @@
@TableField(exist = false)
private String deptName;
- @ApiModelProperty("职务")
- @TableField("duty")
- private String duty;
-
- @ApiModelProperty("专业")
+ @ApiModelProperty(value = "专业",required = true)
@TableField("post")
+ @NotBlank(message = "专业不能为空")
private String post;
- @ApiModelProperty("身份证号")
- @TableField("id_card")
- private String idCard;
-
- @ApiModelProperty("入职时间")
- @TableField("entry_time")
- private LocalDate entryTime;
-
- @ApiModelProperty("离职时间")
- @TableField("resign_time")
- private LocalDate resignTime;
+ @ApiModelProperty("特殊作业证书")
+ @TableField("operation_certificate")
+ private String operationCertificate;
@ApiModelProperty("公司名称")
@TableField(exist = false)
@@ -164,4 +160,11 @@
@TableField(exist = false)
private List<SysRole> roles;
+ @TableField(exist = false)
+ private Long userId;
+
+// @TableField(exist = false)
+// @ApiModelProperty("角色ids")
+// private Set<Long> roleIds;
+
}
--
Gitblit v1.9.2