From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 4a16c32..84e48f4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -91,9 +91,39 @@
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