Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-12 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed

 screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java

@@ -93,13 +93,13 @@

    @ApiOperation(value = "查询所有菜单", notes = "查询所有菜单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "current", value = "页码", required = true, paramType = "query", dataType = "int"),
            @ApiImplicitParam(name = "size", value = "每页数量", required = true, paramType = "query", dataType = "int")
            /*@ApiImplicitParam(name = "current", value = "页码", required = true, paramType = "query", dataType = "int"),
            @ApiImplicitParam(name = "size", value = "每页数量", required = true, paramType = "query", dataType = "int")*/
    })
    @RequestMapping(value = "getAllManageMenu", method = RequestMethod.GET)
    public ResultMessage getAllManageMenu(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        Map<String,Object> resultMap = new HashMap<>();
        /*Map<String,Object> resultMap = new HashMap<>();
        if (parameters.get("current") == null || parameters.get("size") == null){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -109,8 +109,8 @@
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
            return ResultMessage.fail(resultMap);
        }
        List<ManageMenu> result = manageMenuService.getAllWithPagingQuery(parameters);
        }*/
        List<ManageMenu> result = manageMenuService.getAllMenus();
        return ResultMessage.ok(result);
    }