From 1fb4735cf75f6b98b8d81611a95ccea395cba323 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 20 四月 2026 16:35:04 +0800
Subject: [PATCH] 绩效模块调整

---
 ruoyi-system/src/main/resources/mapper/system/UserMapper.xml |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 400ae9a..645504c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -88,11 +88,53 @@
         select id,
                account,
                name,
-               name_en
+               name_en,
+               status
         from user u
-        where depart_lims_id = (select u2.depart_lims_id
+        where depart_lims_id is not null
+          and depart_lims_id != ''
+          and depart_lims_id = (select u2.depart_lims_id
                                 from user u2
                                 where u2.id = #{userId})
     </select>
 
+    <select id="selectUserByDepartmentId" resultType="com.ruoyi.common.core.domain.entity.User"
+            parameterType="java.lang.Integer">
+        select id,
+               dept_id,
+               account,
+               name,
+               name_en,
+               user_type,
+               email,
+               phone,
+               sex,
+               age,
+               signature_url,
+               picture_url,
+               status,
+               del_flag,
+               login_ip,
+               login_date,
+               depart_lims_id,
+               company,
+               is_custom
+        from user
+        where del_flag = '0'
+          and depart_lims_id is not null
+          and depart_lims_id != ''
+          and FIND_IN_SET(#{departmentId}, depart_lims_id)
+    </select>
+    <select id="selectUserListByPerformance" resultType="com.ruoyi.common.core.domain.entity.User">
+        select
+            *
+        from user u
+        <if test="isTestUser!=null and isTestUser">
+            inner join sys_user_role sur on u.id = sur.user_id AND sur.role_id=4
+        </if>
+        where u.status = '0' and u.del_flag = '0'
+        and u.dept_id=124
+        ORDER BY u.sort
+    </select>
+
 </mapper>

--
Gitblit v1.9.3