From a3d87335b9f398d9bb1633b9d3ee6a391b55163d Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Fri, 26 Jul 2024 10:10:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/system/user/user.html   |  4 ++--
 .../system/user/userexamine/examinedetail.html       | 12 ++++++++++--
 .../com/ruoyi/common/core/domain/entity/SysUser.java |  2 +-
 .../main/resources/mapper/system/SysUserMapper.xml   |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index fd620c9..79e54d9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -35,7 +35,7 @@
 						<div class="select-list">
 							<ul>
 								<li>
-									登录名称：<input type="text" name="loginName"/>
+									登录账号：<input type="text" name="loginName"/>
 								</li>
 								<li>
 									手机号码：<input type="text" name="phonenumber"/>
@@ -135,7 +135,7 @@
 		        },
 		        {
 		            field: 'loginName',
-		            title: '登录名称',
+		            title: '登录账号',
 		            sortable: true
 		        },
 		        {
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
index 1f96817..cc3715f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
@@ -80,6 +80,14 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">身份证号码：</label>
+                    <div class="col-sm-8">
+                        <input disabled class="form-control" type="text"  th:field="*{cerno}">
+                    </div>
+                </div>
+            </div>
             <input type="hidden" id="status">
         </div>
         <div class="row">
@@ -172,7 +180,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">是否持有护照或港澳通行证：</label>
                     <div class="col-sm-8">
-                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_user_passport')}">
                             <input type="radio" disabled th:id="${dict.dictCode}" name="havePassport" th:value="${dict.dictValue}" th:field="*{havePassport}">
                             <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
                         </div>
@@ -183,7 +191,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label ">是否具有出入境备案：</label>
                     <div class="col-sm-8">
-                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('sys_user_passport')}">
                             <input type="radio" disabled th:id="${dict.dictCode}" name="entryexitFiling" th:value="${dict.dictValue}" th:field="*{entryexitFiling}">
                             <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
                         </div>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 5a55c30..6be8e35 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -295,7 +295,7 @@ public class SysUser extends BaseEntity
 
     /** 部门对象 */
     @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT)
+        @Excel(name = "所属单位", targetAttr = "deptName", type = Type.EXPORT)
     })
     @TableField(exist=false)
     private SysDept dept;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 399cbb3..d8d9171 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 	
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,have_passport,conf_agreement,entryexit_filing,conf_name,d.dept_name, d.leader from ${prefix}sys_user u
+		select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex,u.cerno, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,have_passport,conf_agreement,entryexit_filing,conf_name,d.dept_name, d.leader from ${prefix}sys_user u
 		left join ${prefix}sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">