From 5ca4ab349909030e77354832287f2d6a2c80e119 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 01 七月 2025 16:58:21 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/multi_system
---
multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 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 5c9a065..cbbeca4 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
@@ -13,6 +13,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -55,10 +56,10 @@
@TableField("user_type")
private Integer userType;
- @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 = true)
+// @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;
@@ -105,6 +106,30 @@
@TableField("version")
private Integer version;
+ @ApiModelProperty("部门")
+ @TableField("dept_id")
+ private Long deptId;
+
+ @ApiModelProperty("部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("职务")
+ @TableField("duty")
+ private String duty;
+
+ @ApiModelProperty("专业")
+ @TableField("post")
+ private String post;
+
+ @ApiModelProperty("身份证号")
+ @TableField("id_card")
+ private String idCard;
+
+ @ApiModelProperty("入职时间")
+ @TableField("entry_time")
+ private LocalDate entryTime;
+
@ApiModelProperty("公司名称")
@TableField(exist = false)
private String companyName;
@@ -120,16 +145,4 @@
@TableField(exist = false)
private List<SysRole> roles;
- @ApiModelProperty("是否为管理员")
- @TableField(exist = false)
- private Boolean admin;
- public boolean isAdmin()
- {
- return isAdmin(this.id);
- }
-
- public static boolean isAdmin(Long userId)
- {
- return userId != null && 1L == userId;
- }
}
--
Gitblit v1.9.2