123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java

@@ -121,6 +121,9 @@ public class UserController extends CommonBaseController {
     @RequestMapping(value = "/front/menus", method = RequestMethod.GET)
     public @ResponseBody
     List<MenuTree> getMenusByUsername(String token,String state) throws Exception {
+        if (StringUtils.isBlank(state)){
+            state="0,1";
+        }
         return permissionService.getMenusByUsername(token,state);
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/PermissionService.java

@@ -177,7 +177,7 @@ public class PermissionService {
         }
         User user = userBiz.getUserByUsername(username);
         List<Menu> menus = menuBiz.getUserAuthorityMenuByUserId(user.getId());
-        menus=menus.stream().filter(a->state.contains(a.getState())).collect(Collectors.toList());
+        menus=menus.stream().filter(a->state.contains(a.getState()==null?"1":a.getState())).collect(Collectors.toList());
         return getMenuTree(menus,AdminCommonConstant.ROOT);
     }
 }