fix: 添加组织结构字段

project-interface/src/main/java/com/dituhui/pea/pojo/OrganizationDTO.java

@@ -17,5 +17,7 @@ public class OrganizationDTO {
 	 * 类型
 	 * 类型
 	 */
 	 */
 	private String type;
 	private String type;
+	
+	private Boolean isActive;
 
 
 }
 }

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -148,19 +148,20 @@ public class UserService {
 					userDTO.setMenus(levelOne);
 					userDTO.setMenus(levelOne);
 
 
 					// 获取组织架构资源
 					// 获取组织架构资源
-					List<OrganizationDTO> allOrgs = resources.stream().filter(r -> r.getType() == 3)
-							// 暂时只允许一种角色
-							.limit(1).map(r -> {
-								List<OrganizationDTO> orgs = Lists.newArrayList();
-								String[] temp = r.getExtra().split("\\|");
-								Result<?> result = organizationService.getAllOrganizations(temp[0],
-										Arrays.asList(temp[1].split(",")));
-								if (StringUtils.equals(ResultEnum.SUCCESS.getCode(), result.getCode())) {
-									orgs = (List<OrganizationDTO>) result.getResult();
-								}
-								return orgs;
-							}).flatMap(a -> a.stream()).collect(Collectors.toList());
-					 userDTO.setAuths(allOrgs);
+					List<OrganizationDTO> allOrgs = resources.stream().filter(r -> r.getType() == 3).map(r -> {
+						List<OrganizationDTO> orgs = Lists.newArrayList();
+						String[] temp = r.getExtra().split("\\|");
+						Result<?> result = organizationService.getAllOrganizations(temp[0],
+								Arrays.asList(temp[1].split(",")));
+						if (StringUtils.equals(ResultEnum.SUCCESS.getCode(), result.getCode())) {
+							orgs = (List<OrganizationDTO>) result.getResult();
+						}
+						return orgs;
+					}).flatMap(a -> a.stream()).collect(Collectors.toList());
+					if (CollectionUtils.isNotEmpty(allOrgs)) {
+						allOrgs.get(0).setIsActive(true);
+					}
+					userDTO.setAuths(allOrgs);
 				}
 				}
 			}
 			}
 		}
 		}