From 072032a61ea2b6de74cdc27841a6876f31dff1ff Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Thu, 21 Apr 2016 15:13:09 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../platform/operate/web/controller/PermissionsController.java | 4 +++- .../lyms/platform/operate/web/controller/UsersController.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java index 4d4f132..bea6b78 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java @@ -62,6 +62,7 @@ public class PermissionsController extends BaseController { @RequestMapping(value = "/permissions", method = RequestMethod.GET) @TokenRequired public void getPermissions(HttpServletResponse response, + @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "page",required = false) Integer page, @RequestParam(value = "limit",required = false) Integer limit) { PermissionsQuery permissionsQuery = new PermissionsQuery(); @@ -69,6 +70,7 @@ public class PermissionsController extends BaseController { limit = null == limit ? 10 : limit; permissionsQuery.setNeed("true"); permissionsQuery.setPage(page); + permissionsQuery.setId(id); permissionsQuery.setLimit(limit); permissionsQuery.setYn(YnEnums.YES.getId()); @@ -122,7 +124,7 @@ public class PermissionsController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsersByLoginCenterId(loginState.getId()); + Users users = usersService.getUsers(loginState.getId()); Permissions permissions = new Permissions(); 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 856d23a..076d180 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 @@ -238,7 +238,7 @@ public class UsersController extends BaseController { query.setYn(YnEnums.YES.getId()); List userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); List roles = new ArrayList<>(); - List permissions = new ArrayList<>(); + List permissions = null; RolePermissionMapsQuery rolePermissionMapsQuery ; for(UserRoleMaps roleMaps : userRoleMapses) { roles.add(rolesService.getRoles(roleMaps.getRoleId())); @@ -249,7 +249,13 @@ public class UsersController extends BaseController { rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { - permissions.add(permissionsService.getPermissions(rolePermissionMaps.getPermissionId())); + Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId()); + if(null != permissions1) { + if(null == permissions) { + permissions = new ArrayList<>(); + } + permissions.add(permissions1); + } } } -- 1.8.3.1