From daac72a57b0d15c07269bb2b8c63dd26440a61e4 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 6 Jul 2018 14:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/UsersController.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 b4927c6..ada944e 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 @@ -492,7 +492,6 @@ public class UsersController extends BaseController { if (null != loginContext) { users = usersService.getUsers(loginContext.getId()); } - String hospitalId = autoMatchFacade.getHospitalId(users.getId()); List permissions = null; @@ -519,12 +518,12 @@ public class UsersController extends BaseController { List permissionIds = new ArrayList<>(); permissions = new ArrayList<>(); - String orgId = autoMatchFacade.getHospitalId(loginContext.getId()); - int rog = NumberUtils.toInt(orgId); + + int rog = NumberUtils.toInt(hospitalId); for (Integer roleMaps : userRoleMapses) { Roles roles1 = rolesService.getRoles(roleMaps); - if (roles1 != null && StringUtils.isNotEmpty(orgId)) { + if (roles1 != null && StringUtils.isNotEmpty(hospitalId)) { if (roles1.getOrgId() == null || roles1.getOrgId() == rog) { roles.add(roles1); } @@ -587,9 +586,9 @@ public class UsersController extends BaseController { //是否是建档医院 users.setbStatus(organization.getbStatus()); - String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); + //String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); //设置建档方式 - String groupId = groupsFacade.findByCurrentUserId(hospital); + String groupId = groupsFacade.findByCurrentUserId(hospitalId); Integer bType = GroupEnums.BuildType.SINGLE.getbType(); if (StringUtils.isNotEmpty(groupId)) { OrganizationGroups groups = groupsService.findById(groupId); @@ -608,8 +607,8 @@ public class UsersController extends BaseController { users.setOrganizations(organizations); /** 设置产检券类型 */ - String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); - Set types = couponService.findTypes(hospital); + //String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); + Set types = couponService.findTypes(hospitalId); Map map = new HashMap<>(); -- 1.8.3.1