From ca7d26d4f59f48e5504fe88bf00336e1fecb593d Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Tue, 7 Sep 2021 09:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/talkonlineweb/mapper/LymsPermissionMapper.java   | 2 +-
 .../java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsPermissionMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsPermissionMapper.java
index ea7b289..8534973 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsPermissionMapper.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsPermissionMapper.java
@@ -15,7 +15,7 @@ public interface LymsPermissionMapper extends BaseMapper<LymsPermission> {
     @Select("SELECT * FROM lyms_permission p,lyms_rolepermiss rp WHERE rp.`pid`=p.`id`  AND rp.`rid`=#{rid} AND p.`pid`=#{pid}")
     List<LymsPermission> sltPermissByRole(@Param("rid") int rid, @Param("pid") int pid);
     @Select("SELECT * FROM lyms_permission p,lyms_rolepermiss rp WHERE rp.`pid`=p.`id`  AND rp.`rid`=#{rid} ")
-    List<LymsPermission> sltPermissByRole(@Param("rid") int rid);
+    List<LymsPermission> sltPermissByRole2(@Param("rid") int rid);
 }
 
 
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java
index a5f2a02..ff1a0a3 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java
@@ -57,7 +57,7 @@ public class LymsUserServiceImpl extends ServiceImpl<LymsUserMapper, LymsUser>
 
         int rid=rLst.get(0).getRid();
 //        取一次菜单
-        List<LymsPermission> pLst=lymsPermissionMapper.sltPermissByRole(rid);
+        List<LymsPermission> pLst=lymsPermissionMapper.sltPermissByRole2(rid);
 //        List<LymsPermission> pLst=lymsPermissionMapper.sltPermissByRole(rid, Constant.ROOT_MENU);
 //        rs.addAll(pLst);
 //        for (LymsPermission p:pLst) {
-- 
1.8.3.1