From 779c235959bd1979381b07ffe561242c9cdd9ce2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 19 二月 2024 15:32:35 +0800
Subject: [PATCH] 指挥端查看权限下全部单兵端提交
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 11e6b31..66aa0b8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -50,6 +50,31 @@
<result property="status" column="role_status"/>
</resultMap>
+ <resultMap type="SysUser" id="SysUserOnlyResult">
+ <id property="userId" column="user_id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="userName" column="user_name"/>
+ <result property="nickName" column="nick_name"/>
+ <result property="email" column="email"/>
+ <result property="phonenumber" column="phonenumber"/>
+ <result property="sex" column="sex"/>
+ <result property="avatar" column="avatar"/>
+ <result property="password" column="password"/>
+ <result property="status" column="status"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="loginIp" column="login_ip"/>
+ <result property="loginDate" column="login_date"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="cameraPriority" column="camera_priority"/>
+ <result property="rongCloudToken" column="rong_cloud_token"/>
+ <result property="appUserType" column="app_user_type"/>
+ <result property="appOnlineState" column="app_online_state"/>
+ <result property="remark" column="remark"/>
+ </resultMap>
+
<sql id="selectUserVo">
select u.user_id,
u.dept_id,
@@ -296,7 +321,7 @@
select user_id,nick_name from sys_user where user_id in (select app_user_id from ard_app_patroluser where patrolplan_id = #{id})
</select>
- <select id="getOnlineCommander" parameterType="String" resultMap="SysUserResult">
+ <select id="getOnlineCommander" parameterType="String" resultMap="SysUserOnlyResult">
select distinct su0.* from sys_user su
inner join sys_user su0 on su.dept_id = su0.dept_id
inner join sys_user_role aur on su0.user_id = aur.user_id
@@ -305,7 +330,7 @@
and sr.role_key = 'appLeader' and su0.app_online_state = '1'
</select>
- <select id="getOnlinePC" resultMap="SysUserResult">
+ <select id="getOnlinePC" resultMap="SysUserOnlyResult">
select distinct su0.* from sys_user su
inner join sys_user su0 on su.dept_id = su0.dept_id
inner join sys_user_role aur on su0.user_id = aur.user_id
@@ -317,4 +342,17 @@
#{userId}
</foreach>
</select>
+
+ <select id="getOwnAndChildrenSoilderList" 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
+ 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>
+ order by su.dept_id asc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3