feat:用户列表修改

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
 		        },
 		        {

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>

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;

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">