From 656d6f8029f8bf9b2daa9dcc89101a879a70b860 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 03 十二月 2025 23:10:05 +0800
Subject: [PATCH] feat:优先添加执行人
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index dbe2adc..ffc09a9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,6 +25,9 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
+ <result property="openId" column="open_id" />
+ <result property="unionId" column="union_id" />
+ <result property="wechatNickname" column="wechat_nickname" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -49,7 +52,7 @@
</resultMap>
<sql id="selectUserVo">
- select u.user_id, u.dept_id, u.user_name,u.oa_user_id, u.oa_order_class, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.oa_user_id, u.create_by, u.create_time, u.remark,
+ select u.user_id, u.dept_id, u.user_name,u.oa_user_id, u.oa_order_class, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.oa_user_id, u.create_by, u.create_time, u.remark,u.open_id,u.union_id,u.wechat_nickname,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
@@ -254,7 +257,7 @@
<select id="selectUsersByBranchDeptIds" resultMap="SysUserResult">
SELECT DISTINCT
u.user_id, u.dept_id, u.user_name, u.nick_name, u.email,
- u.avatar, u.phonenumber, u.sex, u.status, u.del_flag,
+ u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.create_time,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
FROM sys_user u
@@ -263,19 +266,16 @@
LEFT JOIN sys_role r ON r.role_id = ur.role_id
WHERE u.del_flag = '0'
AND u.status = '0'
- AND u.dept_id IN (
- -- 鏌ヨ鍒嗗叕鍙稿強鍏舵墍鏈夊瓙閮ㄩ棬
+ AND u.dept_id IN (
SELECT t.dept_id
FROM sys_dept t
WHERE t.del_flag = '0'
- AND (
- -- 鍒嗗叕鍙告湰韬�
+ AND (
t.dept_id IN
<foreach collection="branchDeptIds" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
- OR
- -- 鍒嗗叕鍙哥殑瀛愰儴闂紙閫氳繃ancestors瀛楁鍖归厤锛�
+ OR
<foreach collection="branchDeptIds" item="deptId" open="(" separator=" OR " close=")">
find_in_set(#{deptId}, t.ancestors) > 0
</foreach>
--
Gitblit v1.9.1