From 8bfb1a91458ff158da73e7b8ccda2501cc7fea04 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 十二月 2023 11:57:00 +0800
Subject: [PATCH] 清淤

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   15 +++++++++++++--
 1 files changed, 13 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 79ee9f1..49f1b86 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,6 +25,7 @@
         <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"/>
         <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -68,6 +69,7 @@
                u.camera_priority,
                u.rong_cloud_token,
                u.app_user_type,
+               u.app_online_state,
                u.remark,
                d.dept_id,
                d.parent_id,
@@ -110,14 +112,18 @@
             AND u.create_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD')
         </if>
         <if test="appUserType!=null and appUserType!=''"> AND u.app_user_type = #{appUserType}</if>
+        <if test="deptId != null ">and (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+            WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+        </if>
         <!-- 鏁版嵁鑼冨洿杩囨护 -->
         ${params.dataScope}
     </select>
     <select id="selectAllAppUserList" parameterType="SysUser" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
         where u.del_flag = '0' and u.app_user_type in('0','1')
-        <!-- 鏁版嵁鑼冨洿杩囨护 -->
-        ${params.dataScope}
+        <if test="deptId != null ">and (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+            WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+        </if>
     </select>
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
@@ -241,6 +247,7 @@
             <if test="cameraPriority != null">camera_priority = #{cameraPriority},</if>
             <if test="rongCloudToken != null">rong_cloud_token = #{rongCloudToken},</if>
             <if test="appUserType != null">app_user_type = #{appUserType},</if>
+            <if test="appOnlineState != null">app_online_state = #{appOnlineState},</if>
             update_time = now()
         </set>
         where user_id = #{userId}
@@ -284,4 +291,8 @@
         inner join sys_dept sd on asy.dept_id = sd.dept_id
         where asy.car_id = #{carId})
     </select>
+
+    <select id="userByPlanId" parameterType="String" resultMap="SysUserResult">
+        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>
 </mapper> 
\ No newline at end of file

--
Gitblit v1.9.3