fix: 序列化问题修复

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

@@ -18,14 +18,4 @@ public class OrganizationDTO {
 	 */
 	 */
 	private String type;
 	private String type;
 
 
-	// 添加默认构造方法,否则反序列化会报错
-	public OrganizationDTO() {
-		super();
-	}
-
-	public OrganizationDTO(String id, String name, String type) {
-		this.id = id;
-		this.name = name;
-		this.type = type;
-	}
 }
 }

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

@@ -25,6 +25,6 @@ public class UserLoginDTO {
 	
 	
 	private List<RoleInfo> roles;
 	private List<RoleInfo> roles;
 	private List<ResourceInfo> menus;
 	private List<ResourceInfo> menus;
-	private List<OrganizationDTO> auths;
+	//private List<OrganizationDTO> auths;
 
 
 }
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrganizationServiceImpl.java

@@ -178,32 +178,51 @@ public class OrganizationServiceImpl implements OrganizationService {
 		case cluster:
 		case cluster:
 			List<OrgClusterEntity> clusters = orgClusterDao.findByClusterIdIn(organizationIds);
 			List<OrgClusterEntity> clusters = orgClusterDao.findByClusterIdIn(organizationIds);
 			if (CollectionUtils.isNotEmpty(clusters)) {
 			if (CollectionUtils.isNotEmpty(clusters)) {
-				return clusters.stream().map(
-						c -> new OrganizationDTO(c.getClusterId(), c.getName(), OrganizationType.cluster.getValue()))
-						.collect(Collectors.toList());
+				return clusters.stream().map(c -> {
+					OrganizationDTO organizationDTO = new OrganizationDTO();
+					organizationDTO.setId(c.getClusterId());
+					organizationDTO.setName(c.getName());
+					organizationDTO.setType(OrganizationType.cluster.getValue());
+					return organizationDTO;
+				}).collect(Collectors.toList());
 			}
 			}
 			break;
 			break;
 		case branch:
 		case branch:
 			List<OrgBranchEntity> branchs = orgBranchDao.findByBranchIdIn(organizationIds);
 			List<OrgBranchEntity> branchs = orgBranchDao.findByBranchIdIn(organizationIds);
 			if (CollectionUtils.isNotEmpty(branchs)) {
 			if (CollectionUtils.isNotEmpty(branchs)) {
-				return branchs.stream().map(c -> new OrganizationDTO(c.getBranchId(), c.getBranchName(),
-						OrganizationType.branch.getValue())).collect(Collectors.toList());
+				return branchs.stream().map(c -> {
+					OrganizationDTO organizationDTO = new OrganizationDTO();
+					organizationDTO.setId(c.getBranchId());
+					organizationDTO.setName(c.getBranchName());
+					organizationDTO.setType(OrganizationType.branch.getValue());
+					return organizationDTO;
+				}
+
+				).collect(Collectors.toList());
 			}
 			}
 			break;
 			break;
 		case group:
 		case group:
 			List<OrgGroupEntity> groups = orgGroupDao.findByGroupIdIn(organizationIds);
 			List<OrgGroupEntity> groups = orgGroupDao.findByGroupIdIn(organizationIds);
 			if (CollectionUtils.isNotEmpty(groups)) {
 			if (CollectionUtils.isNotEmpty(groups)) {
-				return groups.stream().map(
-						c -> new OrganizationDTO(c.getGroupId(), c.getGroupName(), OrganizationType.group.getValue()))
-						.collect(Collectors.toList());
+				return groups.stream().map(c -> {
+					OrganizationDTO organizationDTO = new OrganizationDTO();
+					organizationDTO.setId(c.getGroupId());
+					organizationDTO.setName(c.getGroupName());
+					organizationDTO.setType(OrganizationType.group.getValue());
+					return organizationDTO;
+				}).collect(Collectors.toList());
 			}
 			}
 			break;
 			break;
 		case team:
 		case team:
 			List<OrgTeamEntity> teams = orgTeamDao.findByTeamIdIn(organizationIds);
 			List<OrgTeamEntity> teams = orgTeamDao.findByTeamIdIn(organizationIds);
 			if (CollectionUtils.isNotEmpty(teams)) {
 			if (CollectionUtils.isNotEmpty(teams)) {
-				return teams.stream()
-						.map(c -> new OrganizationDTO(c.getTeamId(), c.getTeamName(), OrganizationType.team.getValue()))
-						.collect(Collectors.toList());
+				return teams.stream().map(c -> {
+					OrganizationDTO organizationDTO = new OrganizationDTO();
+					organizationDTO.setId(c.getTeamId());
+					organizationDTO.setName(c.getTeamName());
+					organizationDTO.setType(OrganizationType.team.getValue());
+					return organizationDTO;
+				}).collect(Collectors.toList());
 			}
 			}
 			break;
 			break;
 		default:
 		default:

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

@@ -164,7 +164,7 @@ public class UserService {
 								}
 								}
 								return orgs;
 								return orgs;
 							}).flatMap(a -> a.stream()).collect(Collectors.toList());
 							}).flatMap(a -> a.stream()).collect(Collectors.toList());
-					userDTO.setAuths(allOrgs);
+					//userDTO.setAuths(allOrgs);
 				}
 				}
 			}
 			}
 		}
 		}