diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java index dc23bf5..dc8f843 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -163,7 +163,7 @@ public class DepartmentsController extends BaseController { @RequestMapping(value = "/departments", method = RequestMethod.GET) @ResponseBody @TokenRequired - public void getPermissions(HttpServletResponse response, + public FrontEndResult getPermissions(HttpServletResponse response, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "limit", required = false) Integer limit, @@ -191,8 +191,8 @@ public class DepartmentsController extends BaseController { frontEndResult.setData(departmentses); frontEndResult.setPageInfo(departmentsQuery.getPageInfo()); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); + return frontEndResult; +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 8240075..43be70b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -178,7 +178,7 @@ public class OrganizationController extends BaseController { @RequestMapping(value = "/organization", method = RequestMethod.GET) @ResponseBody @TokenRequired - public void getOrganization(HttpServletResponse response, + public FrontEndResult getOrganization(HttpServletResponse response, @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "page", required = false) Integer page, @@ -205,7 +205,8 @@ public class OrganizationController extends BaseController { frontEndResult.setPageInfo(organizationQuery.getPageInfo()); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); + return frontEndResult; +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 35c80f3..4465a10 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -297,7 +297,7 @@ public class RolesController extends BaseController { @RequestMapping(value = "/userRoles", method = RequestMethod.GET) @ResponseBody @TokenRequired - public void getUserList(HttpServletResponse response, + public FrontEndResult getUserList(HttpServletResponse response, @RequestParam(value = "keyword",required = false) String keyword, @RequestParam(value = "page",required = false) Integer page, @RequestParam(value = "limit",required = false) Integer limit, @@ -322,7 +322,9 @@ public class RolesController extends BaseController { frontEndResult.setData(roles); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); + return frontEndResult; + + // ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } @@ -332,7 +334,7 @@ public class RolesController extends BaseController { @RequestMapping(value = "/adminRoles", method = RequestMethod.GET) @ResponseBody @TokenRequired - public void getAdminList(HttpServletResponse response, + public FrontEndResult getAdminList(HttpServletResponse response, @RequestParam(value = "keyword",required = false) String keyword, @RequestParam(value = "page",required = false) Integer page, @RequestParam(value = "limit",required = false) Integer limit) { @@ -356,7 +358,7 @@ public class RolesController extends BaseController { frontEndResult.setPageInfo(rolesQuery.getPageInfo()); frontEndResult.setData(roles); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); + return frontEndResult; +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 6d4613f..2f9c862 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -61,7 +61,7 @@ public class UsersController extends BaseController { @RequestMapping(value = "/admins", method = RequestMethod.GET) @ResponseBody @TokenRequired - public void getAdminList(HttpServletResponse response, + public FrontEndResult getAdminList(HttpServletResponse response, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "rolesId", required = false) Integer rolesId, @RequestParam(value = "page", required = false) Integer page, @@ -93,8 +93,8 @@ public class UsersController extends BaseController { frontEndResult.setPageInfo(usersQuery.getPageInfo()); frontEndResult.setData(users); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); + return frontEndResult; +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } @@ -105,7 +105,7 @@ public class UsersController extends BaseController { @RequestMapping(value = "/users", method = RequestMethod.GET) @TokenRequired @ResponseBody - public void getPermissions(HttpServletResponse response, + public FrontEndResult getPermissions(HttpServletResponse response, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "rolesId", required = false) Integer rolesId, @RequestParam(value = "page", required = false) Integer page, @@ -143,7 +143,8 @@ public class UsersController extends BaseController { frontEndResult.setData(users); frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); + return frontEndResult; +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult); } //获取用户角色信息