From c0f16750cb9097a8db7b68f8c1794c2aec28ca15 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期四, 24 七月 2025 15:01:10 +0800
Subject: [PATCH] 新增
---
multi-system/src/main/resources/mapper/system/SysUserMapper.xml | 12 ++++++++++--
1 files changed, 10 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 b4be28b..de62190 100644
--- a/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -32,6 +32,11 @@
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="entryTime" column="entry_time" />
+ <result property="resignTime" column="resign_time" />
+ <result property="personType" column="person_type" />
+ <result property="age" column="age" />
+ <result property="positional" column="positional" />
+
</resultMap>
@@ -49,7 +54,7 @@
<select id="userList" resultMap="SysUserResult">
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.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
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
@@ -67,6 +72,9 @@
</if>
<if test="userType != null">
AND u.user_type = #{userType}
+ </if>
+ <if test="deptId != null">
+ AND d.dept_id = #{deptId}
</if>
<if test="companyId != null ">
AND u.company_id = #{companyId}
@@ -102,7 +110,7 @@
<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
+ 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
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
--
Gitblit v1.9.2