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 { @Select("SELECT * FROM lyms_permission p,lyms_rolepermiss rp WHERE rp.`pid`=p.`id` AND rp.`rid`=#{rid} AND p.`pid`=#{pid}") List 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 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 List rLst=lymsRoleMapper.sltRoleByUser(uLst.get(0).getUid()); int rid=rLst.get(0).getRid(); -// 首次取一次菜单 - List pLst=lymsPermissionMapper.sltPermissByRole(rid, Constant.ROOT_MENU); - rs.addAll(pLst); - for (LymsPermission p:pLst) { +// 取一次菜单 + List pLst=lymsPermissionMapper.sltPermissByRole(rid); +// List pLst=lymsPermissionMapper.sltPermissByRole(rid, Constant.ROOT_MENU); +// rs.addAll(pLst); +// for (LymsPermission p:pLst) { //获取二级菜单 - List sLst=lymsPermissionMapper.sltPermissByRole(rid, p.getId()); +// List sLst=lymsPermissionMapper.sltPermissByRole(rid, p.getId()); // Map oneMap=new HashMap<>(); // oneMap.put("menu",p); // oneMap.put("children",sLst); // rs.add(oneMap); - rs.addAll(sLst); - } +// rs.addAll(sLst); +// } - return rs; + return pLst; } /**