From c562df9aaeded98fdb38cf0181fe9f72f658f05d Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Thu, 21 Apr 2016 18:47:50 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../platform/operate/web/controller/DepartmentsController.java | 2 +- .../platform/operate/web/controller/OrganizationController.java | 2 +- .../com/lyms/platform/operate/web/controller/RolesController.java | 4 ++-- .../com/lyms/platform/operate/web/controller/UsersController.java | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) 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 2620fe8..bb537c8 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 @@ -123,7 +123,7 @@ public class DepartmentsController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsersByLoginCenterId(loginState.getId()); + Users users = usersService.getUsers(loginState.getId()); if (null == name || null == orgId || null == users || null == organization) { ResultUtils.buildParameterErrorResultAndWrite(response); 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 b0a5febe..7a6f8d0 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 @@ -129,7 +129,7 @@ public class OrganizationController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsersByLoginCenterId(loginState.getId()); + Users users = usersService.getUsers(loginState.getId()); if (type == null || StringUtils.isBlank(name) || null == users) { ResultUtils.buildParameterErrorResultAndWrite(response); 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 e67ff6a..f025c00 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 @@ -126,7 +126,7 @@ public class RolesController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsersByLoginCenterId(loginState.getId()); + Users users = usersService.getUsers(loginState.getId()); if ( StringUtils.isBlank(name) || null == users) { ResultUtils.buildParameterErrorResultAndWrite(response); @@ -165,7 +165,7 @@ public class RolesController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsersByLoginCenterId(loginState.getId()); + Users users = usersService.getUsers(loginState.getId()); if (StringUtils.isBlank(name) || null == users) { ResultUtils.buildParameterErrorResultAndWrite(response); 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 076d180..aab4ef9 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 @@ -370,7 +370,7 @@ public class UsersController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users user = usersService.getUsersByLoginCenterId(loginState.getId()); + Users user = usersService.getUsers(loginState.getId()); if (StringUtils.isBlank(roleIds) || @@ -463,7 +463,7 @@ public class UsersController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users user = usersService.getUsersByLoginCenterId(loginState.getId()); + Users user = usersService.getUsers(loginState.getId()); Departments departments = departmentsService.getDepartments(deptId); @@ -670,7 +670,7 @@ public class UsersController extends BaseController { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users user = usersService.getUsersByLoginCenterId(loginState.getId()); + Users user = usersService.getUsers(loginState.getId()); if (user != null) { //检查账户是否存在 @@ -828,7 +828,7 @@ public class UsersController extends BaseController { } //获取登录用户 LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsersByLoginCenterId(loginContext.getId()); + Users users = usersService.getUsers(loginContext.getId()); if (null != users) { //修改前的密码 -- 1.8.3.1