From 2a83dc06a43087f7ca6bebd5440530b2b3c16b85 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 22 七月 2023 15:30:52 +0800
Subject: [PATCH] 三一车辆消息打印取消提交
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 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 585ce64..08396d0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -87,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,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
+-- 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}
@@ -117,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
--
Gitblit v1.9.3