From aaa9b0a5f169eb7928adf9466f026bdcd0045535 Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Mon, 6 Sep 2021 20:56:25 +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

---
 .../lyms/talkonlineweb/mapper/LymsPermissionMapper.java |  2 ++
 .../talkonlineweb/service/impl/LymsUserServiceImpl.java | 17 +++++++++--------
 2 files changed, 11 insertions(+), 8 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 fa234e0..ea7b289 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsPermissionMapper.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsPermissionMapper.java
@@ -14,6 +14,8 @@ 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);
 }
 
 
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 ba258a8..a5f2a02 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
@@ -56,20 +56,21 @@ public class LymsUserServiceImpl extends ServiceImpl<LymsUserMapper, LymsUser>
          List<LymsRole> rLst=lymsRoleMapper.sltRoleByUser(uLst.get(0).getUid());
 
         int rid=rLst.get(0).getRid();
-//        首次取一次菜单
-        List<LymsPermission> pLst=lymsPermissionMapper.sltPermissByRole(rid, Constant.ROOT_MENU);
-        rs.addAll(pLst);
-        for (LymsPermission p:pLst) {
+//        取一次菜单
+        List<LymsPermission> pLst=lymsPermissionMapper.sltPermissByRole(rid);
+//        List<LymsPermission> pLst=lymsPermissionMapper.sltPermissByRole(rid, Constant.ROOT_MENU);
+//        rs.addAll(pLst);
+//        for (LymsPermission p:pLst) {
             //获取二级菜单
-            List<LymsPermission> sLst=lymsPermissionMapper.sltPermissByRole(rid, p.getId());
+//            List<LymsPermission> sLst=lymsPermissionMapper.sltPermissByRole(rid, p.getId());
 //            Map<String, Object> oneMap=new HashMap<>();
 //            oneMap.put("menu",p);
 //            oneMap.put("children",sLst);
 //            rs.add(oneMap);
-            rs.addAll(sLst);
-        }
+//            rs.addAll(sLst);
+//        }
 
-        return rs;
+        return pLst;
     }
 
     /**
-- 
1.8.3.1