From 664fd1119db534b3746bc211f063f89b57d9db3b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 24 七月 2023 17:18:26 +0800
Subject: [PATCH] 三一车辆命令代码修改提交
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index a15bc0b..5f916c9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,7 @@
<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="remark" column="remark"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -64,6 +65,7 @@
u.create_by,
u.create_time,
u.camera_priority,
+ u.rong_cloud_token,
u.remark,
d.dept_id,
d.parent_id,
@@ -85,10 +87,10 @@
</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,u.camera_priority, d.dept_name, d.leader from sys_user
- u
- left join sys_dept d on u.dept_id = d.dept_id
+-- 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,u.camera_priority,u.rong_cloud_token, 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 != ''">
AND u.user_id = #{userId}
@@ -115,7 +117,17 @@
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
-
+ <select id="selectAppUserList" parameterType="SysUser" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.del_flag = '0'
+ and LOWER(r.role_name) like '%app%'
+ <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>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ </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
@@ -234,6 +246,7 @@
<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>
update_time = now()
</set>
where user_id = #{userId}
@@ -270,4 +283,11 @@
</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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3