fangcheng / regional-platform

Download as
Browse Code ยป

Commit 45566bc132ad7c7cc57d0873e47866f83667f5ee

Authored by zhangrui
2 parents 0965c94c98 f87e8b5fe3
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java View file @ 45566bc
... ... @@ -18,7 +18,9 @@
18 18  
19 19 public List<Permissions> queryPermissions(PermissionsQuery query);
20 20  
21   - List<Permissions> queryPermissionByRoleIds(Integer roleIds);
  21 + List<Permissions> queryPermissionByRoleIds(List<Integer> statusList);
  22 +
  23 + List<Permissions> queryPermissionByRoleIds1(Integer roleIds);
22 24  
23 25 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java View file @ 45566bc
... ... @@ -17,6 +17,7 @@
17 17 public int queryPermissionsCount(PermissionsQuery query);
18 18  
19 19 public List<Permissions> queryPermissions(PermissionsQuery query);
20   - List<Permissions> queryPermissionByRoleIds(Integer roleIds);
  20 + List<Permissions> queryPermissionByRoleIds(List<Integer> roleIds);
  21 + List<Permissions> queryPermissionByRoleIds1(Integer roleIds);
21 22 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java View file @ 45566bc
... ... @@ -48,8 +48,11 @@
48 48 return permissionsMapper.queryPermissions(query);
49 49 }
50 50  
51   - public List<Permissions> queryPermissionByRoleIds(Integer roleIds) {
  51 + public List<Permissions> queryPermissionByRoleIds(List<Integer> roleIds) {
52 52 return permissionsMapper.queryPermissionByRoleIds(roleIds);
  53 + }
  54 + public List<Permissions> queryPermissionByRoleIds1(Integer roleIds){
  55 + return permissionsMapper.queryPermissionByRoleIds1(roleIds);
53 56 }
54 57 }
platform-biz-service/src/main/resources/mainOrm/Permissions.xml View file @ 45566bc
... ... @@ -180,10 +180,17 @@
180 180 <include refid="PermissionsCondition" />
181 181 </select>
182 182  
183   -<select id="queryPermissionByRoleIds" parameterType="java.lang.Integer" resultMap="PermissionsResultMap">
184   - select b.* from role_permission_maps a, permissions b where a.yn=1 and b.yn=1 and a.role_id =
185   - #{weight,jdbcType=INTEGER}
  183 +<select id="queryPermissionByRoleIds" parameterType="java.util.List" resultMap="PermissionsResultMap">
  184 + select b.* from role_permission_maps a, permissions b where a.yn=1 and b.yn=1 and a.role_id
  185 + in
  186 + <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
  187 + #{item}
  188 + </foreach>
186 189 and a.permission_id=b.id ORDER BY weight
187 190 </select>
  191 + <select id="queryPermissionByRoleIds1" parameterType="int" resultMap="PermissionsResultMap">
  192 + select b.* from role_permission_maps a, permissions b where a.yn=1 and b.yn=1 and a.role_id=
  193 + #{weight,jdbcType=INTEGER}
  194 + </select>
188 195 </mapper>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 45566bc
... ... @@ -391,7 +391,7 @@
391 391  
392 392 List<Permissions> permissionses;
393 393 for (Roles roles1 : roles) {
394   - permissionses = permissionsService.queryPermissionByRoleIds(roles1.getId());
  394 + permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId());
395 395  
396 396 /* RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
397 397 rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
... ... @@ -460,7 +460,7 @@
460 460 if (permissions.getYn().equals(YnEnums.NO.getId())) continue;
461 461 permissionses.add(permissions);
462 462 }*/
463   - permissionses= permissionsService.queryPermissionByRoleIds(roles1.getId());
  463 + permissionses= permissionsService.queryPermissionByRoleIds1(roles1.getId());
464 464  
465 465 roles1.setPermissions(permissionses);
466 466 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 45566bc
... ... @@ -374,14 +374,13 @@
374 374 }
375 375 }
376 376 }*/
377   -
378   - List<Permissions> local = permissionsService.queryPermissionByRoleIds(roleMaps);
379   - if(CollectionUtils.isNotEmpty(local)){
380   - for(Permissions permissions1:local){
381   - if(!permissionIds.contains(permissions1.getId())) {
382   - permissionIds.add(permissions1.getId());
383   - permissions.add(permissions1);
384   - }
  377 + }
  378 + List<Permissions> local = permissionsService.queryPermissionByRoleIds(userRoleMapses);
  379 + if(CollectionUtils.isNotEmpty(local)){
  380 + for(Permissions permissions1:local){
  381 + if(!permissionIds.contains(permissions1.getId())) {
  382 + permissionIds.add(permissions1.getId());
  383 + permissions.add(permissions1);
385 384 }
386 385 }
387 386 }