From 5b29b1da107432a963b45b34a0d22b9f58a77e5f Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Mon, 28 Mar 2016 11:53:45 +0800 Subject: [PATCH] platform permission login model move login center --- .../operate/web/controller/DepartmentsController.java | 5 ++++- .../platform/operate/web/controller/UsersController.java | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 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 becac43..3ff25b5 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 @@ -34,6 +34,8 @@ public class DepartmentsController extends BaseController { private UserRoleMapsService userRoleMapsService; @Autowired private RolePermissionMapsService rolePermissionMapsService; + @Autowired + private OrganizationService organizationService; @@ -117,13 +119,14 @@ public class DepartmentsController extends BaseController { @RequestParam(value = "description") String description, @RequestParam(value = "shortCode") String shortCode) { + Organization organization = organizationService.getOrganization(orgId); //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsersByLoginCenterId(loginState.getId()); - if (null == name || null == orgId || null == users) { + if (null == name || null == orgId || null == users || null == organization) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } 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 02c1edf..9c9bb5f 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 @@ -26,6 +26,8 @@ import java.util.*; */ @Controller public class UsersController extends BaseController { + @Autowired + private DepartmentsService departmentsService; @Autowired private UsersService usersService; @@ -257,10 +259,11 @@ public class UsersController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users user = usersService.getUsersByLoginCenterId(loginState.getId()); + Departments departments = departmentsService.getDepartments(deptId); + Organization organization = organizationService.getOrganization(orgId); if (type == null || StringUtils.isBlank(roleIds) || deptId == null || - StringUtils.isBlank(name) /*|| StringUtils.isBlank(account) || - StringUtils.isBlank(pwd) */ || StringUtils.isBlank(phone) || null == user) { + StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user || null == departments || null == organization) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } @@ -348,6 +351,13 @@ public class UsersController extends BaseController { + Departments departments = departmentsService.getDepartments(deptId); + Organization organization = organizationService.getOrganization(orgId); + + if(null == departments || null == organization) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } //获取登录用户ID Integer userId = Integer.valueOf(tokenService.getUserId(token)); -- 1.8.3.1