From b95699652357c6218b45eceb81170ddfebb30e1d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 16:06:25 +0800
Subject: [PATCH] fix conflect
---
src/main/resources/mapper/UserMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 1545105..fb8962c 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -7,11 +7,19 @@
a.*
FROM
t_user a
+ left join t_company b on a.company_id = b.id
<where>
+ and a.id not in (
+ SELECT b.user_id FROM t_user_role b
+ WHERE b.role_id = ( SELECT id FROM t_role WHERE role_name = #{record.roleName})
+ )
<if test="record != null" >
<if test="record.username!=null">
and a.username like concat ('%',#{record.username},'%')
</if>
+ <if test="record.companyId!=null">
+ and a.company_id = #{record.companyId}
+ </if>
</if>
</where>
order by a.create_time desc
--
Gitblit v1.9.1