jiangjiazhi / regional-platform

Authored by rui.zhang about 9 years ago

Exists in master and in 8 other branches

权限去重

Showing 3 changed files with 30 additions and 1 deletions

1	1	package com.lyms.platform.permission.model;
2	2
3	3	import java.util.Date;
	4	+import java.util.List;
4	5
5	6	public class Roles {
6	7	private Integer id;
...	...	@@ -16,6 +17,16 @@
16	17	private String shortCode;
17	18	private String hospitalid;
18	19	private Integer permissiontype;
	20	+
	21	+ private List<Permissions> permissions;
	22	+
	23	+ public List<Permissions> getPermissions() {
	24	+ return permissions;
	25	+ }
	26	+
	27	+ public void setPermissions(List<Permissions> permissions) {
	28	+ this.permissions = permissions;
	29	+ }
19	30
20	31	public String getHospitalid() {
21	32	return hospitalid;

...	...	@@ -249,7 +249,7 @@
249	249	<if test="yn != null and yn != ''">
250	250	and u.yn = #{yn,jdbcType=INTEGER}
251	251	</if>
252		- <if test="type != null and type != ''">
	252	+ <if test="type != null ">
253	253	and u.type = #{type,jdbcType=INTEGER}
254	254	</if>
255	255	</select>

...	...	@@ -367,6 +367,24 @@
367	367
368	368	List<Roles> roles = rolesService.queryRoles(rolesQuery);
369	369
	370	+ List<Permissions> permissionses = null;
	371	+ for(Roles roles1 : roles) {
	372	+ permissionses = new ArrayList<>();
	373	+ RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
	374	+ rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
	375	+ rolePermissionMapsQuery.setRoleId(roles1.getId());
	376	+ List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
	377	+
	378	+ for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
	379	+ Permissions permissions = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
	380	+ if(permissions.getYn().equals(YnEnums.NO.getId())) continue;
	381	+ permissionses.add(permissions);
	382	+ }
	383	+
	384	+ roles1.setPermissions(permissionses);
	385	+ }
	386	+
	387	+
370	388
371	389	FrontEndResult frontEndResult = new FrontEndResult();
372	390	frontEndResult.setPageInfo(rolesQuery.getPageInfo());