From 62cd9d30a8995f11be78aeb49815e7f7d4a11506 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 13 十月 2026 17:45:18 +0800
Subject: [PATCH] 设备模块后端调整：档案修订保存时自动同步生成本年度校准、核查、保养计划明细（校准计划时间取有效期前一个月，核查、保养取下次日期前一个月）；设备新增保养、核查日期与周期字段；设备树查询改为全部/设备/计量器具分类；新增检测员角色人员查询接口；导入模板移除所属部门列
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index e3a4e6e..7db5013 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -83,6 +83,29 @@
group by u1.id
</select>
+ <!-- 鑾峰彇妫�娴嬪憳瑙掕壊浜哄憳淇℃伅 -->
+ <select id="selectInspectorUserList" resultType="com.ruoyi.common.core.domain.entity.User">
+ select u1.id,
+ u1.account,
+ u1.name,
+ u1.name_en,
+ u1.email,
+ u1.phone,
+ u1.company,
+ u1.is_custom,
+ u1.signature_url,
+ u1.picture_url,
+ u1.depart_lims_id
+ from user u1
+ left join sys_user_role sur on sur.user_id = u1.id
+ left join sys_role r on r.role_id = sur.role_id and r.role_name = '妫�娴嬪憳'
+ where r.role_id is not null
+ and u1.status = '0'
+ and u1.del_flag = '0'
+ and u1.id != 1
+ group by u1.id
+ </select>
+
<!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴� -->
<select id="selectDepartmentLimsUserList" resultType="com.ruoyi.common.core.domain.entity.User">
select id,
--
Gitblit v1.9.3