From 13d69aed798c6c68d7d1ceb7e4c06047cfbf12e2 Mon Sep 17 00:00:00 2001
From: luyya <luya0519>
Date: Tue, 16 Sep 2025 17:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E5=9F=8E=E7=94=A8=E6=88=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/system/domain/SysUser.java   |  2 ++
 .../java/org/dromara/system/domain/bo/SysUserBo.java   |  2 ++
 .../java/org/dromara/system/domain/vo/SysUserVo.java   |  2 ++
 .../src/main/resources/mapper/system/SysUserMapper.xml | 10 +++++-----
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java
index 4028aa2f..eef399ec 100644
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysUser.java
@@ -105,6 +105,8 @@ public class SysUser extends TenantEntity {
 
     private String manageDeptId;
 
+    private String idCard;
+
 
     public SysUser(Long userId) {
         this.userId = userId;
diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
index ea591729..cd44d22e 100644
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
@@ -110,6 +110,8 @@ public class SysUserBo extends BaseEntity {
 
     private String manageDeptId;
 
+    private String idCard;
+
     public SysUserBo(Long userId) {
         this.userId = userId;
     }
diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
index 4f6eb2e5..1cdd286f 100644
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
@@ -114,6 +114,8 @@ public class SysUserVo implements Serializable {
     private Date createTime;
 
     private String manageDeptId;
+
+    private String idCard;
     /**
      * 部门名
      */
diff --git a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml
index 332fc58b..d443c974 100644
--- a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -18,7 +18,7 @@
         </if>
         <if test="ew.getSqlSelect == null">
             u.user_id, u.dept_id, u.nick_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
+            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.id_card
         </if>
         from sys_user u
         ${ew.getCustomSqlSegment}
@@ -31,7 +31,7 @@
         </if>
         <if test="ew.getSqlSelect == null">
             u.user_id, u.dept_id, u.nick_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
+            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.id_card
         </if>
         from sys_user u
         ${ew.getCustomSqlSegment}
@@ -39,7 +39,7 @@
 
     <select id="selectUserExportList" resultMap="SysUserExportResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex,
-               u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+               u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,,u.id_card
                d.dept_name, d.leader, u1.user_name as leaderName
         from sys_user u
                  left join sys_dept d on u.dept_id = d.dept_id
@@ -48,7 +48,7 @@
     </select>
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.user_type, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id, u.user_name, u.user_type, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.id_card
         from sys_user u
              left join sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
@@ -57,7 +57,7 @@
     </select>
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.user_type, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id, u.dept_id, u.user_name, u.user_type, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.id_card
         from sys_user u
              left join sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id