From a4052e2940840e590afbf941d8693c2e71ff8c64 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 13:49:26 +0800
Subject: [PATCH] 巡检修改
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7afc0da..49f1b86 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,9 @@
<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"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -64,6 +67,9 @@
u.create_by,
u.create_time,
u.camera_priority,
+ u.rong_cloud_token,
+ u.app_user_type,
+ u.app_online_state,
u.remark,
d.dept_id,
d.parent_id,
@@ -85,12 +91,9 @@
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
- u
- left join sys_dept d on u.dept_id = d.dept_id
+ <include refid="selectUserVo"/>
where u.del_flag = '0'
- <if test="userId != null and userId != 0">
+ <if test="userId != null and userId != ''">
AND u.user_id = #{userId}
</if>
<if test="userName != null and userName != ''">
@@ -108,14 +111,20 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
AND u.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD')
</if>
- <if test="deptId != null and deptId != 0">
- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as
- varchar) = any(string_to_array(ancestors,',')) ))
+ <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')
+ <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
from sys_user u
@@ -185,7 +194,7 @@
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
- <if test="userId != null and userId != 0">user_id,</if>
+ <if test="userId != null and userId != ''">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
@@ -198,6 +207,7 @@
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="cameraPriority != null">camera_priority,</if>
+ <if test="appUserType != null and appUserType != ''">app_user_type,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -213,6 +223,7 @@
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="cameraPriority != null">#{cameraPriority},</if>
+ <if test="appUserType != null">#{appUserType},</if>
now()
)
</insert>
@@ -234,6 +245,9 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<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}
@@ -270,4 +284,15 @@
</foreach>
</delete>
+ <select id="getSysUserByCarId" parameterType="java.lang.String" resultMap="SysUserResult">
+ select * from sys_user su where su.dept_id in (
+ select cast(unnest(array_append(string_to_array(sd.ancestors,','),
+ cast(sd.dept_id as text))) as int) from ard_sy_car asy
+ 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