From 24e152d8a574e77b1909a8fea4703d4fe835c2a5 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 05 七月 2024 11:53:07 +0800
Subject: [PATCH] 查询电磁锁及挂接的车辆提交
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 66aa0b8..a014700 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -343,7 +343,7 @@
</foreach>
</select>
- <select id="getOwnAndChildrenSoilderList" resultMap="SysUserOnlyResult">
+ <select id="getOwnAndChildrenOnlineSoilderList" resultMap="SysUserOnlyResult">
select distinct su.user_id,su.dept_id,su.user_name,
concat(su.nick_name,'(',sd.dept_name,')') as nick_name from sys_user su
inner join sys_user_role sur on su.user_id = sur.user_id
@@ -353,6 +353,22 @@
<foreach collection="deptIdList" item="deptId" open="(" close=")" separator=",">
#{deptId}
</foreach>
+ and su.app_online_state = '1' and su.status = '0' and su.del_flag = '0'
+ order by su.dept_id asc
+ </select>
+
+ <select id="getOwnAndChildrenSoilderListAll" resultMap="SysUserOnlyResult">
+ select distinct su.user_id,su.dept_id,su.user_name,
+ concat(su.nick_name,'(',sd.dept_name,')') as nick_name,
+ su.app_online_state from sys_user su
+ inner join sys_user_role sur on su.user_id = sur.user_id
+ inner join sys_role sr on sur.role_id = sr.role_id
+ inner join sys_dept sd on su.dept_id = sd.dept_id
+ where sr.role_key = 'appUser' and su.dept_id in
+ <foreach collection="deptIdList" item="deptId" open="(" close=")" separator=",">
+ #{deptId}
+ </foreach>
+ and su.status = '0' and su.del_flag = '0'
order by su.dept_id asc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3