From 338f2f5afc7762dabf2409f296d5d023462ed4b5 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 28 八月 2025 17:18:25 +0800
Subject: [PATCH] 部分新功能

---
 multi-system/src/main/resources/mapper/system/SysUserMapper.xml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/multi-system/src/main/resources/mapper/system/SysUserMapper.xml b/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 4c0eb6f..106ef79 100644
--- a/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -36,6 +36,8 @@
         <result property="personType"        column="person_type"          />
         <result property="age"        column="age"          />
         <result property="positional"        column="positional"          />
+        <result property="qualification"        column="qualification"          />
+        <result property="operationCertificate"        column="operation_certificate"          />
 
     </resultMap>
 
@@ -65,7 +67,7 @@
     <select id="userList"  resultMap="SysUserVoResult">
         select u.id,u.username,u.name,u.user_type,u.phone,u.parent_id,u.company_id,u.sex,u.status,u.del_flag,u.version,
                u.login_ip,u.login_date,u.create_by,u.create_time,u.remark,c.name as company_name,su.name as parent_name,
-                u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,u.person_type,u.age,u.positional
+                u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,u.person_type,u.age,u.positional,u.qualification,u.operation_certificate
         from sys_user u
         left join sys_company c on c.id=u.company_id
         left join sys_user su on su.id=u.parent_id and u.parent_id!=0
@@ -82,6 +84,12 @@
             <if test="status != null and status != ''">
                 AND u.status = #{status}
             </if>
+            <if test="personType != null">
+                AND u.person_type = #{personType}
+            </if>
+            <if test="qualification != null">
+                AND u.qualification = #{qualification}
+            </if>
             <if test="userType != null">
                 AND u.user_type = #{userType}
             </if>
@@ -93,6 +101,9 @@
             </if>
             <if test="phone != null and phone != ''">
                 AND u.phone like concat('%', #{phone}, '%')
+            </if>
+            <if test="post != null and post != ''">
+                AND u.post like concat('%', #{post}, '%')
             </if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
@@ -109,6 +120,7 @@
             <if test="params.userType != null and params.userType==0">
                 AND u.user_type in (1,2,3,4)
             </if>
+
         </where>
         order by u.id desc
     </select>
@@ -122,7 +134,8 @@
 
     <select id="getUserById" resultMap="SysUserResult">
         select u.id,u.username,u.user_type,u.name,u.phone,u.parent_id,u.company_id,u.status,u.sex,u.del_flag,u.version,c.name as company_name,
-               c.remain_period,su.name as parent_name,u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,u.person_type,u.age,u.positional
+               c.remain_period,su.name as parent_name,u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,
+               u.person_type,u.age,u.positional,u.qualification,u.operation_certificate
         from sys_user u
        left join sys_company c on c.id=u.company_id
        left join sys_user su on su.id=u.parent_id and u.parent_id!=0
@@ -174,4 +187,7 @@
         </if>
     </select>
 
+
+
+
 </mapper>

--
Gitblit v1.9.2