From 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jun 2022 11:50:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/resources/mapper/RoleMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml
index 92d5440..485e29f 100644
--- a/src/main/resources/mapper/RoleMapper.xml
+++ b/src/main/resources/mapper/RoleMapper.xml
@@ -12,6 +12,9 @@
                 <if test="record.roleName!=null">
                     and a.role_name like concat ('%',#{record.roleName},'%')
                 </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