更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationRelationDaoImpl.java

@@ -47,6 +47,14 @@ public class OrganizationRelationDaoImpl extends BaseImpl implements Organizatio
             criteria.and("relOrganization").is(Organization.build(param.getRelId()));
         }
 
+        if (StringUtils.isNotEmpty(param.getMainOid())) {
+            criteria.and("mainOid").is(param.getMainOid());
+        }
+
+        if (StringUtils.isNotEmpty(param.getRelOid())) {
+            criteria.and("relOid").is(param.getRelOid());
+        }
+
         // 绑定类型
         if (param.getRelationType() != null) {
             criteria.and("relationType").is(param.getRelationType());

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/OrganizationRelation.java

@@ -30,6 +30,8 @@ public class OrganizationRelation extends SuperMain {
     @DBRef(lazy = true)
     private Organization mainOrganization;
 
+    private String mainOid;
+
     @Schema(description = "主名称")
     private String mainName;
 
@@ -43,6 +45,8 @@ public class OrganizationRelation extends SuperMain {
     @Schema(description = "关联的名称")
     private String relName;
 
+    private String relOid;
+
     @Schema(description = "被绑定的数据类型")
     private AuthType relAuthType;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/orgManager/ProjectBindOrgServiceImpl.java

@@ -149,11 +149,13 @@ public class ProjectBindOrgServiceImpl extends SuperService {
                 orgRelation.setMainOrganization(projectInfo);
                 orgRelation.setMainName(projectInfo.getName());
                 orgRelation.setAuthType(projectInfo.getAuthType());
+                orgRelation.setMainOid(projectInfo.getOid());
 
                 orgRelation.setRelOrganization(orgInfo);
                 orgRelation.setRelName(orgInfo.getName());
                 orgRelation.setRelAuthType(orgInfo.getAuthType());
                 orgRelation.setRelationType(OrganizationRelationType.ProjectBindOrg);
+                orgRelation.setRelOid(orgInfo.getOid());
 
                 orgRelation.setAboutOid(projectInfo.getOid());
                 orgRelation.setAboutAuthType(projectInfo.getAuthType());
@@ -174,7 +176,11 @@ public class ProjectBindOrgServiceImpl extends SuperService {
     public ResultContent<Page<ProjectBindOrgModel>> orgPage(OrganizationRelationSearch param, Pageable pageable) {
         // projectOid
         Assert.hasText(param.getProjectOid(), "projectOid不能为空");
-        param.setMainOid(param.getProjectOid());
+        Organization organization = organizationDao.findTopByOid(param.getProjectOid());
+        if (ObjectUtils.isEmpty(organization)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getProjectOid()));
+        }
+        param.setMainId(organization.getId());
         Page<OrganizationRelation> page = organizationRelationDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }