Jelajahi Sumber

listTreeByRoleId

shiqian 4 tahun lalu
induk
melakukan
82c7668807

+ 4 - 3
boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java

@@ -101,14 +101,15 @@ public class SysMenuController extends BaseController
     }
     }
 
 
    /**
    /**
-    * 功能描述: 根据roleId查找的叶子结点去匹配所对应的菜单树
+    * 功能描述: before: 根据roleId查找的叶子结点去匹配所对应的菜单树,
+    * after: 不需要传roleId,查全部的,这样可以保证所有的角色都可以拿到所有的的菜单
     *
     *
     * @param roleId roleId
     * @param roleId roleId
     * @return com.boman.common.core.web.domain.AjaxResult
     * @return com.boman.common.core.web.domain.AjaxResult
     */
     */
     @GetMapping(value = "/listTreeByRoleId/{roleId}")
     @GetMapping(value = "/listTreeByRoleId/{roleId}")
     public AjaxResult listTreeByRoleId(@PathVariable("roleId") Long roleId) {
     public AjaxResult listTreeByRoleId(@PathVariable("roleId") Long roleId) {
-        return AjaxResult.success(menuService.listTreeByRoleId(roleId));
+        return AjaxResult.success(menuService.listTreeByRoleId(null));
     }
     }
 
 
 
 
@@ -133,7 +134,7 @@ public class SysMenuController extends BaseController
      * 功能描述: 根据menuId和roleId,找到此菜单以及子菜单下所有的叶子节点, 同时匹配叶子结点对应的头部的规则
      * 功能描述: 根据menuId和roleId,找到此菜单以及子菜单下所有的叶子节点, 同时匹配叶子结点对应的头部的规则
      *
      *
      * @param menuId menuId
      * @param menuId menuId
-     * @param roleId roleId
+     * @param roleId roleIdmenu/listTreeByRoleId/1
      * @return com.boman.common.core.web.domain.AjaxResult
      * @return com.boman.common.core.web.domain.AjaxResult
      */
      */
     @GetMapping(value = "/listMenus/roleId/{roleId}/menuId/{menuId}")
     @GetMapping(value = "/listMenus/roleId/{roleId}/menuId/{menuId}")

+ 3 - 2
boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -137,8 +137,9 @@
 		FROM
 		FROM
 			sys_menu m
 			sys_menu m
 				LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
 				LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
-		WHERE
-			rm.role_id = #{roleId}
+		<if test="roleId != null and roleId != ''">
+			WHERE rm.role_id = #{roleId}
+		</if>
 	</select>
 	</select>
 
 
 	<update id="updateMenu" parameterType="SysMenu">
 	<update id="updateMenu" parameterType="SysMenu">

+ 0 - 1
boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -86,7 +86,6 @@ public class TableContext {
         String tableName = genTable.getTableName();
         String tableName = genTable.getTableName();
         String functionName = genTable.getFunctionName();
         String functionName = genTable.getFunctionName();
 
 
-        // 当前登陆人对应的menu,看看是否包含保存功能
         LoginUser loginUser = getLoginUser();
         LoginUser loginUser = getLoginUser();
         if (SysUser.isAdmin(loginUser.getUserid())) {
         if (SysUser.isAdmin(loginUser.getUserid())) {
             return;
             return;