Commit daac72a57b0d15c07269bb2b8c63dd26440a61e4
1 parent
26112659bd
Exists in
master
and in
1 other branch
用户登陆
Showing 1 changed file with 7 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
daac72a
| ... | ... | @@ -492,7 +492,6 @@ |
| 492 | 492 | if (null != loginContext) { |
| 493 | 493 | users = usersService.getUsers(loginContext.getId()); |
| 494 | 494 | } |
| 495 | - | |
| 496 | 495 | String hospitalId = autoMatchFacade.getHospitalId(users.getId()); |
| 497 | 496 | |
| 498 | 497 | List<Permissions2> permissions = null; |
| 499 | 498 | |
| 500 | 499 | |
| ... | ... | @@ -519,12 +518,12 @@ |
| 519 | 518 | |
| 520 | 519 | List<Integer> permissionIds = new ArrayList<>(); |
| 521 | 520 | permissions = new ArrayList<>(); |
| 522 | - String orgId = autoMatchFacade.getHospitalId(loginContext.getId()); | |
| 523 | 521 | |
| 524 | - int rog = NumberUtils.toInt(orgId); | |
| 522 | + | |
| 523 | + int rog = NumberUtils.toInt(hospitalId); | |
| 525 | 524 | for (Integer roleMaps : userRoleMapses) { |
| 526 | 525 | Roles roles1 = rolesService.getRoles(roleMaps); |
| 527 | - if (roles1 != null && StringUtils.isNotEmpty(orgId)) { | |
| 526 | + if (roles1 != null && StringUtils.isNotEmpty(hospitalId)) { | |
| 528 | 527 | if (roles1.getOrgId() == null || roles1.getOrgId() == rog) { |
| 529 | 528 | roles.add(roles1); |
| 530 | 529 | } |
| 531 | 530 | |
| ... | ... | @@ -587,9 +586,9 @@ |
| 587 | 586 | //是否是建档医院 |
| 588 | 587 | users.setbStatus(organization.getbStatus()); |
| 589 | 588 | |
| 590 | - String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); | |
| 589 | + //String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); | |
| 591 | 590 | //设置建档方式 |
| 592 | - String groupId = groupsFacade.findByCurrentUserId(hospital); | |
| 591 | + String groupId = groupsFacade.findByCurrentUserId(hospitalId); | |
| 593 | 592 | Integer bType = GroupEnums.BuildType.SINGLE.getbType(); |
| 594 | 593 | if (StringUtils.isNotEmpty(groupId)) { |
| 595 | 594 | OrganizationGroups groups = groupsService.findById(groupId); |
| ... | ... | @@ -608,8 +607,8 @@ |
| 608 | 607 | users.setOrganizations(organizations); |
| 609 | 608 | |
| 610 | 609 | /** 设置产检券类型 */ |
| 611 | - String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); | |
| 612 | - Set<Integer> types = couponService.findTypes(hospital); | |
| 610 | + //String hospital = autoMatchFacade.getHospitalId(loginContext.getId()); | |
| 611 | + Set<Integer> types = couponService.findTypes(hospitalId); | |
| 613 | 612 | |
| 614 | 613 | |
| 615 | 614 | Map<String, Object> map = new HashMap<>(); |