From 3d296df1ff6f6c34a68d228f5766ebe44cf169e1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 28 七月 2023 15:41:56 +0800
Subject: [PATCH] 三一车辆实时位置加入用户追踪提交

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |   11 +++++++++--
 1 files changed, 9 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..dadfb99 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}

--
Gitblit v1.9.3