shiyang / regional-platform

Download as
Browse Code »

Commit 8ce3e4ec4f37e47d0efe73ccbaa6dd5d2b026a17

Authored by jiangjiazhi
2 parents 1320f7dced 80fd238dc6
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 8ce3e4e
... ... @@ -96,6 +96,7 @@
96 96 if(!departments.getName().equals(name)) {
97 97 DepartmentsQuery departmentsQuery = new DepartmentsQuery();
98 98 departments.setYn(YnEnums.YES.getId());
  99 + departments.setOrgId(orgId);
99 100 departmentsQuery.setName(name);
100 101 if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
101 102 ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在");
... ... @@ -145,6 +146,7 @@
145 146 }
146 147 DepartmentsQuery departmentsQuery = new DepartmentsQuery();
147 148 departmentsQuery.setName(name);
  149 + departmentsQuery.setOrgId(orgId);
148 150 departmentsQuery.setYn(YnEnums.YES.getId());
149 151 departmentsQuery.setOrgId(orgId);
150 152 if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java View file @ 8ce3e4e
... ... @@ -87,7 +87,7 @@
87 87 }
88 88  
89 89  
90   - if (user.getType().equals(2) || user.getType().equals(0) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) {
  90 + if ((user.getType().equals(2) || user.getType().equals(0)) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) {
91 91 parentId = SystemConfig.CHINA_BASIC_ID;
92 92 query.setParentId(parentId);
93 93 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 8ce3e4e
... ... @@ -298,38 +298,52 @@
298 298 users = usersService.getUsers(loginContext.getId());
299 299 }
300 300  
301   - //获取用户角色信息
302   - UserRoleMapsQuery query = new UserRoleMapsQuery();
303   - query.setUserId(users.getId());
304   - query.setYn(YnEnums.YES.getId());
305   - List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
306   - List<Roles> roles = new ArrayList<>();
307 301 List<Permissions> permissions = null;
308   - RolePermissionMapsQuery rolePermissionMapsQuery ;
309   - List<Integer> permissionIds = new ArrayList<>();
310   - for(Integer roleMaps : userRoleMapses) {
311   - roles.add(rolesService.getRoles(roleMaps));
  302 + List<Roles> roles = new ArrayList<>();
  303 + //超级管理员拥有所有角色和权限
  304 + if(users.getType().equals(2)) {
  305 + RolesQuery rolesQuery = new RolesQuery();
  306 + rolesQuery.setYn(YnEnums.YES.getId());
  307 + roles = rolesService.queryRoles(rolesQuery);
312 308  
313   - //获取角色权限信息
314   - rolePermissionMapsQuery = new RolePermissionMapsQuery();
315   - rolePermissionMapsQuery.setRoleId(roleMaps);
316   - rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
317   - List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
  309 + PermissionsQuery permissionsQuery = new PermissionsQuery();
  310 + permissionsQuery.setYn(YnEnums.YES.getId());
  311 + permissions = permissionsService.queryPermissions(permissionsQuery);
318 312  
319   - for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
320   - Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
321   - if(null != permissions1) {
322   - if(null == permissions) {
323   - permissions = new ArrayList<>();
  313 +
  314 + }
  315 + //其他用户
  316 + else if(users.getType().equals(0) || users.getType().equals(1)){
  317 + //获取用户角色信息
  318 + UserRoleMapsQuery query = new UserRoleMapsQuery();
  319 + query.setUserId(users.getId());
  320 + query.setYn(YnEnums.YES.getId());
  321 + List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
  322 + RolePermissionMapsQuery rolePermissionMapsQuery ;
  323 + List<Integer> permissionIds = new ArrayList<>();
  324 + for(Integer roleMaps : userRoleMapses) {
  325 + roles.add(rolesService.getRoles(roleMaps));
  326 +
  327 + //获取角色权限信息
  328 + rolePermissionMapsQuery = new RolePermissionMapsQuery();
  329 + rolePermissionMapsQuery.setRoleId(roleMaps);
  330 + rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
  331 + List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
  332 +
  333 + for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
  334 + Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
  335 + if(null != permissions1) {
  336 + if(null == permissions) {
  337 + permissions = new ArrayList<>();
  338 + }
  339 + if(!permissionIds.contains(permissions1.getId())) {
  340 + permissions.add(permissions1);
  341 + permissionIds.add(permissions1.getId());
  342 + }
324 343 }
325   - if(!permissionIds.contains(permissions1.getId())) {
326   - permissions.add(permissions1);
327   - permissionIds.add(permissions1.getId());
328   - }
329 344 }
330 345 }
331 346 }
332   -
333 347  
334 348 Map<String, Object> map = new HashMap<>();
335 349 map.put("user", users);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java View file @ 8ce3e4e
... ... @@ -45,9 +45,9 @@
45 45 @Override
46 46 public BasicConfig convertToDataModel() {
47 47 BasicConfig basicConfig = new BasicConfig();
48   - if(StringUtils.isEmpty(code)){
49   - return null;
50   - }
  48 +// if(StringUtils.isEmpty(code)){
  49 +// return null;
  50 +// }
51 51 if(StringUtils.isEmpty(name)){
52 52 return null;
53 53 }