机构类型

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -265,6 +265,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             param.setState(OrganizationState.Normal);
         }
         BeanUtils.copyProperties(param, main);
+        organizationDao.save(main);
 
         // 找出关联的项目
         OrganizationRelation organizationRelation = organizationRelationDao.findTopByMainOrganizationAndRelationType(main, OrganizationRelationType.SchoolToProject);
@@ -273,7 +274,9 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         }
         organizationRelation.setAuthType(AuthType.School);
         organizationRelation.setMainOrganization(main);
+        organizationRelation.setMainName(main.getName());
         organizationRelation.setRelOrganization(organization);
+        organizationRelation.setRelName(organization.getName());
         organizationRelation.setRelationType(OrganizationRelationType.SchoolToProject);
         organizationRelationDao.save(organizationRelation);
 
@@ -379,8 +382,9 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
                 Organization organization = organizationDao.findTopByOid(param.getProjectOid());
                 List<OrganizationRelation> list = organizationRelationDao.findByRelOrganizationAndRelationType(organization, OrganizationRelationType.SchoolToProject);
                 if (ObjectUtils.isNotEmpty(list)) {
+                    // 项目关联的信息oid
                     List<String> oids = list.stream().map(it -> {
-                        return it.getOid();
+                        return it.getMainOrganization().getOid();
                     }).collect(Collectors.toList());
                     param.setOids(oids);
                 } else {