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 3ff25b5..9ca9b1d 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 @@ -96,7 +96,6 @@ public class DepartmentsController extends BaseController { departments.setDescription(description); departments.setShortcode(shortCode); departments.setModified(new Date()); - departments.setYn(YnEnums.YES.getId()); departmentsService.updateDepartments(departments); ResultUtils.buildSuccessResultAndWrite(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 f27f5b1..032601e 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 @@ -101,7 +101,6 @@ public class OrganizationController extends BaseController { organization.setAddress(address); organization.setDescription(description); organization.setShortcode(shortCode); - organization.setYn(YnEnums.YES.getId()); organization.setModified(new Date()); organizationService.updateOrganization(organization); 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 9c9bb5f..db24bbb 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 @@ -339,6 +339,7 @@ public class UsersController extends BaseController { @RequestMapping(value = "/users/{id}", method = RequestMethod.PUT) @TokenRequired public void updateUsers(HttpServletResponse response, + HttpServletRequest request, @PathVariable(value = "id") Integer id, @RequestParam(value = "deptId",required = false) Integer deptId, @RequestParam(value = "orgId",required = false) Integer orgId, @@ -359,10 +360,10 @@ public class UsersController extends BaseController { return; } - //获取登录用户ID - Integer userId = Integer.valueOf(tokenService.getUserId(token)); - if (userId != null) { - Users u = usersService.getUsers(userId); + //获取登录用户 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + Users user = usersService.getUsersByLoginCenterId(loginState.getId()); + if (user != null) { //检查账户是否存在 UsersQuery usersQuery = new UsersQuery(); @@ -385,9 +386,6 @@ public class UsersController extends BaseController { users.setPhone(phone); users.setEnable(enable); users.setRemarks(remarks); - users.setPublishId(u.getId()); - users.setPublishName(u.getName()); - users.setYn(YnEnums.YES.getId()); users.setModified(new Date()); // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6))); usersService.updateUsers(users); @@ -408,16 +406,15 @@ public class UsersController extends BaseController { UserRoleMaps userRoleMaps = new UserRoleMaps(); String[] roleArrayIds = roleIds.split(","); - List user = usersService.queryUsers(usersQuery); for (String tmp : roleArrayIds) { Roles roles = rolesService.getRoles(Integer.valueOf(tmp)); if (roles == null || roles.getYn() == YnEnums.NO.getId()) { continue; } - if (user.get(0).getId() != null) { + if (user.getId() != null) { userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(tmp))); - userRoleMaps.setUserId(user.get(0).getId()); + userRoleMaps.setUserId(user.getId()); userRoleMaps.setYn(YnEnums.YES.getId()); userRoleMapsService.addUserRoleMaps(userRoleMaps); }