From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
user-server/src/main/resources/mapper/UserMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index ecdc611..4ce6510 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -6,7 +6,7 @@
select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
- u1.name_en
+ u1.name_en,u1.depart_lims_id
from user u1
left join user u2 on u2.id = u1.create_user
left join user u3 on u3.id = u1.update_user
@@ -16,6 +16,24 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="selectPersonnelOverview" resultType="com.yuanchu.mom.dto.UserPageDto">
+ select * from (
+ select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
+ u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
+ create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
+ u1.name_en
+ from user u1
+ left join user u2 on u2.id = u1.create_user
+ left join user u3 on u3.id = u1.update_user
+ left join role r on u1.role_id = r.id
+ where u1.depart_lims_id is not null
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
<select id="getDeviceManager" resultType="com.yuanchu.mom.dto.UserPageDto">
select id, name
from user
--
Gitblit v1.9.3