From 23992364d62892baebfba878a2ea9c944d0e4763 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 15 一月 2026 13:40:51 +0800
Subject: [PATCH] fix：资源要求-人员-奖惩记录，新增无员工信息问题
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index f16af39..84e48f4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -25,7 +25,7 @@
is_custom
from user
where del_flag = '0'
- and id != ) a
+ and id != 1) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -88,11 +88,42 @@
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>
+
</mapper>
--
Gitblit v1.9.3