From bab6c5da7fcb44e634f4eaa45f81732a82190071 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Wed, 18 Mar 2026 19:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E5=88=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/app/AppUserMapper.xml    |  9 +++++++--
 .../main/resources/mapper/app/CompanyMapper.xml    |  2 +-
 .../main/resources/mapper/system/SysUserMapper.xml | 14 ++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
index 8690991..1db03a1 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
@@ -38,6 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,dw_userid from app_user
     </sql>
 
+    <sql id="selectSysUserVo">
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.id_card
+        from sys_user u
+    </sql>
+
     <select id="selectAppUserList" parameterType="AppUser" resultMap="AppUserResult">
         <include refid="selectAppUserVo"/>
         <where>  del_flag = '0'
@@ -61,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="selectByJobId" resultType="com.ruoyi.common.core.domain.entity.AppUser" parameterType="java.lang.Long">
-        SELECT * FROM app_user WHERE user_id IN (
+        <include refid="selectAppUserVo"/> WHERE user_id IN (
             select DISTINCT au.USER_ID  from APP_USER au
                                                  INNER JOIN JOB_APPLY ja ON ja.USER_ID  = au.USER_ID
             WHERE au.DEL_FLAG = '0' AND ja.DEL_FLAG = '0'  AND ja.JOB_Id = #{jobId})
@@ -120,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSysUserIdcard" resultType="com.ruoyi.common.core.domain.entity.SysUser">
-        select * from sys_user where del_flag='0'
+        <include refid="selectSysUserVo"/> where del_flag='0'
         <if test="idCard!=null and idCard!=''">
             and id_card=#{idCard}
         </if>
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
index 3c84f48..a0939c8 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="label" resultMap="CompanyResult">
-        SELECT * FROM COMPANY WHERE COMPANY_ID IN (select -1
+        <include refid="selectCompanyVo" /> WHERE COMPANY_ID IN (select -1
                                                  <if test="companyNature!=null and companyNature!=''">
                                                      UNION
                                                      SELECT COMPANY_ID  FROM COMPANY WHERE nature = #{companyNature}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 817c8b7..38a75c9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -47,6 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
+
+	<sql id="selectAppUserVo">
+		select user_id, name, age, sex, birth_date, education, political_affiliation, phone, avatar, salary_min, salary_max, area, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark,job_title_id,is_recommend,id_card,work_experience,is_company_user,dw_userid from app_user
+	</sql>
 	
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
@@ -57,6 +61,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
+
+	<sql id="selectSysUserVo">
+		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.id_card
+		from sys_user u
+	</sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, 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, d.dept_name, d.leader,u.id_card from sys_user u
@@ -152,8 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
+
     <select id="selectAppUserById" resultType="com.ruoyi.common.core.domain.entity.AppUser">
-		select * from app_user where user_id = #{id}
+		<include refid="selectAppUserVo" /> where user_id = #{id}
 	</select>
 
     <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -238,7 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	</delete>
 
 	<select id="selectUserByIdCard" resultType="com.ruoyi.common.core.domain.entity.SysUser">
-		select * from sys_user where del_flag='0' and id_card = #{idCard} LIMIT 1
+		<include refid="selectSysUserVo" /> where del_flag='0' and id_card = #{idCard} LIMIT 1
 	</select>
 	
 </mapper> 
\ No newline at end of file