update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrganizationRelationController.java

@@ -1,5 +1,6 @@
 package com.keao.edu.user.controller;
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
@@ -22,6 +23,8 @@ public class ExamOrganizationRelationController extends BaseController {
 
     @Autowired
     private ExamOrganizationRelationService examOrganizationRelationService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("分页查询")
     @GetMapping(value = "/list")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamOrganizationRelationQueryInfo.java

@@ -12,12 +12,23 @@ import javax.management.Query;
  */
 public class ExamOrganizationRelationQueryInfo extends QueryInfo {
 
+    @ApiModelProperty(value = "合作单位编号")
+    private Integer organId;
+
     @ApiModelProperty(value = "考试项目编号")
     private Integer examId;
 
     @ApiModelProperty(value = "分润结算方式")
     private SettlementTypeEnum settlementType;
 
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
     public Integer getExamId() {
         return examId;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -135,10 +135,14 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		if(Objects.isNull(organization)){
 			throw new BizException("当前声部不存在");
 		}
-		List<Integer> selfAndChildOrganIds = organDao.getSelfAndChildOrganIds(organization.getLevel()<=0?organization.getId().toString():organization.getParentOrganIdTag());
+		StringBuffer parentOrganIdTag= new StringBuffer(Objects.isNull(organization.getParentOrganIdTag())?"":organization.getParentOrganIdTag());
+		parentOrganIdTag.append(",");
+		parentOrganIdTag.append(organization.getId());
+		List<Integer> selfAndChildOrganIds = organDao.getSelfAndChildOrganIds(parentOrganIdTag.toString());
 		if(null == selfAndChildOrganIds){
 			selfAndChildOrganIds= Collections.EMPTY_LIST;
 		}
+		selfAndChildOrganIds.add(organization.getId());
 		return selfAndChildOrganIds;
 	}
 }