From e4205ffc8227be017910a9049565c8fededd8548 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 11:51:59 +0800
Subject: [PATCH] fix：去掉用户标签功能修复
---
src/main/resources/mapper/UserMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 0d3b2e1..4d49779 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -346,8 +346,8 @@
<if test="userName != null and userName != ''">
AND real_name LIKE concat('%',#{userName},'%')
</if>
- <if test="role != null and role.size() > 0">
- AND role IN <foreach collection="role" item="item" open="(" separator="," close=")"> #{item} </foreach>
+ <if test="roles != null and roles.size() > 0">
+ AND role IN <foreach collection="roles" item="item" open="(" separator="," close=")"> #{item} </foreach>
</if>
GROUP BY a.id
</select>
@@ -543,10 +543,10 @@
<select id="getDeptAdmins" resultType="com.mindskip.xzs.domain.Department" parameterType="java.lang.Integer">
<if test="id != null">
- select a.id, a.name from t_department a inner join t_user_department b on a.id = b.department_id where a.deleted = 0 and b.dept_admin = 1 and b.user_id = #{id} order by a.id desc
+ select a.id, a.name, a.parent_id from t_department a inner join t_user_department b on a.id = b.department_id where a.deleted = 0 and b.dept_admin = 1 and b.user_id = #{id} order by a.id
</if>
<if test="id == null">
- select a.id, a.name from t_department a where a.deleted = 0 order by a.id desc
+ select a.id, a.name, a.parent_id from t_department a where a.deleted = 0 order by a.id
</if>
</select>
--
Gitblit v1.8.0