jiangjiazhi / regional-platform

Authored by rui.zhang over 9 years ago

Exists in master and in 8 other branches

权限去重

Showing 2 changed files with 22 additions and 1 deletions

...	...	@@ -27,6 +27,7 @@
27	27	private List<Roles> roles;
28	28	private Departments departmentses;
29	29	private Organization organization;
	30	+ private List<Organization> organizations;
30	31	private String foreignId;
31	32
32	33	private String roleStr;
...	...	@@ -70,6 +71,14 @@
70	71
71	72	public void setOrganization(Organization organization) {
72	73	this.organization = organization;
	74	+ }
	75	+
	76	+ public List<Organization> getOrganizations() {
	77	+ return organizations;
	78	+ }
	79	+
	80	+ public void setOrganizations(List<Organization> organizations) {
	81	+ this.organizations = organizations;
73	82	}
74	83
75	84	public List<Roles> getRoles() {

...	...	@@ -85,8 +85,20 @@
85	85	//设置用户角色信息
86	86	for(Users user : users) {
87	87	user.setRoles(this.getUserRoles(user.getId()));
88		- user.setOrganization(organizationService.getOrganization(user.getOrgId()));
	88	+
89	89	user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
	90	+
	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);
90	102	}
91	103
92	104	FrontEndResult frontEndResult = new FrontEndResult();