fangcheng / regional-platform

Download as
Browse Code »

Commit 038bed9dd31bed4bf39e26f6e4846a50312e3373

Authored by jiangjiazhi
1 parent 0292e1cee8
Exists in master and in 1 other branch nobuildprocess

修改获取管理员权限的时候

Showing 2 changed files with 34 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 038bed9
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.constants.ErrorCodeConstants;
9 9 import com.lyms.platform.common.enums.YnEnums;
10 10 import com.lyms.platform.common.utils.*;
  11 +import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
11 12 import com.lyms.platform.operate.web.result.FrontEndResult;
12 13 import com.lyms.platform.permission.model.*;
13 14 import com.lyms.platform.permission.service.*;
... ... @@ -51,6 +52,8 @@
51 52 private RolePermissionMapsService rolePermissionMapsService;
52 53 @Autowired
53 54 private PermissionsService permissionsService;
  55 + @Autowired
  56 + private AccessPermissionFacade accessPermissionFacade;
54 57  
55 58 private static final String LYMS = "龙源美生";
56 59  
... ... @@ -88,17 +91,7 @@
88 91  
89 92 user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
90 93  
91   - UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
92   - userOrganizationMapsQuery.setUserId(user.getId());
93   - userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
94   - List<UserOrganizationMaps> userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
95   - List<Organization> organizations = null;
96   - for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
97   - organizations = new ArrayList<>();
98   - organizations.add(organizationService.getOrganization(userOrganizationMaps.getOrgId()));
99   - }
100   -
101   - user.setOrganizations(organizations);
  94 + user.setOrganizations(accessPermissionFacade.findAccessPerminssionByUserId(user.getId()));
102 95 }
103 96  
104 97 FrontEndResult frontEndResult = new FrontEndResult();
... ... @@ -106,7 +99,6 @@
106 99 frontEndResult.setData(users);
107 100 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
108 101 return frontEndResult;
109   -// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
110 102 }
111 103  
112 104  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java View file @ 038bed9
... ... @@ -6,8 +6,10 @@
6 6 import com.lyms.platform.common.result.BaseResponse;
7 7 import com.lyms.platform.common.utils.Assert;
8 8 import com.lyms.platform.operate.web.request.AccessPermissionAddRequest;
  9 +import com.lyms.platform.permission.model.Organization;
9 10 import com.lyms.platform.permission.model.Roles;
10 11 import com.lyms.platform.permission.model.Users;
  12 +import com.lyms.platform.permission.service.OrganizationService;
11 13 import com.lyms.platform.permission.service.RolesService;
12 14 import com.lyms.platform.permission.service.UserRoleMapsService;
13 15 import com.lyms.platform.permission.service.UsersService;
... ... @@ -19,10 +21,7 @@
19 21 import org.springframework.beans.factory.annotation.Autowired;
20 22 import org.springframework.stereotype.Component;
21 23  
22   -import java.util.ArrayList;
23   -import java.util.HashMap;
24   -import java.util.List;
25   -import java.util.Map;
  24 +import java.util.*;
26 25  
27 26 /**
28 27 *
... ... @@ -41,6 +40,8 @@
41 40 private UserRoleMapsService userRoleMapsService;
42 41 @Autowired
43 42 private DataPermissionService dataPermissionService;
  43 + @Autowired
  44 + private OrganizationService organizationService;
44 45  
45 46 //修改访问权限
46 47 public BaseResponse updateAccessPermission(){
... ... @@ -99,6 +100,31 @@
99 100 dataPermissionsModel.setUserId(Integer.valueOf(accessPermissionAddRequest.getUserId()));
100 101 dataPermissionService.addOrUpdatePermission(dataPermissionsModel);
101 102 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功.");
  103 + }
  104 +
  105 + public List findAccessPerminssionByUserId(Integer userId){
  106 + Users users =usersService.getUsers(userId);
  107 +
  108 + Assert.notNull(users, "用户信息不存在.");
  109 + DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
  110 + dataPermissionsModelQuery.setUserId(userId);
  111 + List<DataPermissionsModel> data =dataPermissionService.queryPermission(dataPermissionsModelQuery);
  112 + List<Organization> dataList =new ArrayList<>();
  113 + if(CollectionUtils.isNotEmpty(data)){
  114 + Set<String > set = data.get(0).getData().keySet();
  115 + Iterator<String> it = set.iterator();
  116 + while(it.hasNext()){
  117 + String id = it.next();
  118 + try {
  119 + Organization organization = organizationService.getOrganization(Integer.valueOf(id));
  120 + if(null!=organization){
  121 + dataList.add(organization);
  122 + }
  123 + }catch (Exception e){
  124 + }
  125 + }
  126 + }
  127 + return dataList;
102 128 }
103 129 }