From 2d68f48eeb8f874240f7b02ff20dbf1e784271b4 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 29 七月 2023 08:28:38 +0800
Subject: [PATCH] 单兵端-新任务轮询接口-更新弹窗标记/统计弹窗未查看数量
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 5bc4bd2..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,6 +112,9 @@
AND u.create_time <= 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>
@@ -242,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