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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index f419216..fb8962c 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -7,7 +7,7 @@
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
@@ -17,8 +17,8 @@
<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