Commit c52193f0 authored by 李永强's avatar 李永强

调整功能

parent 41012341
Pipeline #219 canceled with stages
...@@ -53,8 +53,7 @@ public class LoginIntercept implements HandlerInterceptor { ...@@ -53,8 +53,7 @@ public class LoginIntercept implements HandlerInterceptor {
try { try {
user = userService.getUser(accessToken.getUser().getId()); user = userService.getUser(accessToken.getUser().getId());
} catch (ServiceException e) { } catch (ServiceException e) {
ApiResult result = new ApiResult(Constants.FAIL); ApiResult result = new ApiResult(Constants.FAIL, e.getMessage());
result.setMessage(e.getMessage());
returnJson(response, result); returnJson(response, result);
return false; return false;
} }
......
...@@ -33,12 +33,12 @@ public class JurisdictionController { ...@@ -33,12 +33,12 @@ public class JurisdictionController {
}) })
@RequestMapping(value = "/menus", method = RequestMethod.GET) @RequestMapping(value = "/menus", method = RequestMethod.GET)
public Object findMenus(HttpServletRequest request, public Object findMenus(HttpServletRequest request,
@RequestParam(required = false) String remark, @RequestParam(required = false) String describe,
@RequestParam(required = false) String url) { @RequestParam(required = false) String url) {
Integer pageNum = (Integer) request.getAttribute(Constants.PAGE_NUM); Integer pageNum = (Integer) request.getAttribute(Constants.PAGE_NUM);
Integer pageSize = (Integer) request.getAttribute(Constants.PAGE_SIZE); Integer pageSize = (Integer) request.getAttribute(Constants.PAGE_SIZE);
Menu menu = new Menu(); Menu menu = new Menu();
menu.setRemark(remark); menu.setDescribe(describe);
menu.setUrl(url); menu.setUrl(url);
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
List<Menu> list = jurisdictionService.findMenus(menu); List<Menu> list = jurisdictionService.findMenus(menu);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment