From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/UserMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index d417a2a..805f424 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -7,14 +7,26 @@
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 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.companyId!=null">
+ and a.company_id = #{record.companyId}
+ </if>
</if>
</where>
order by a.create_time desc
</select>
+ <select id="selectByUserNameAndPassword" resultType="com.xcong.farmer.cms.modules.system.entity.UserEntity">
+ SELECT a.* FROM t_user a where a.username = #{username} and a.password = #{password}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1