From f04b8922283120e2bc4a476ddc302ebd3b0894e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 20:42:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/UserMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 1ca8883..805f424 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -7,14 +7,18 @@
a.*
FROM
t_user a
- left join t_belong b on a.belong_id = b.id
+ 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 in ( SELECT id FROM t_role WHERE role_id = #{record.roleId})
+ )
<if test="record != null" >
<if test="record.username!=null">
and a.username like concat ('%',#{record.username},'%')
</if>
- <if test="record.belongId!=null">
- and a.belong_id = #{record.belongId}
+ <if test="record.companyId!=null">
+ and a.company_id = #{record.companyId}
</if>
</if>
</where>
--
Gitblit v1.9.1