-

Signed-off-by: Administrator <admin@example.com>

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java

@@ -70,7 +70,7 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
     /**
      * 集团Id
      */
-    private Integer combineId;
+    private String combineId;
 
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java

@@ -36,7 +36,7 @@ public class CompanyRelationTableV1Service {
 
     public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception {
         Map<String, Object> map = null;
-        if (dto.getCompanyType().equals(3)) {
+        if (dto.getCompanyType().equals(3) || dto.getCompanyType().equals(4)) {
             map = dskOpenApiUtil.requestBody("/operate/consultancy/combineDetailPage", BeanUtil.beanToMap(dto, false, false));
         } else {
             map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
@@ -69,7 +69,7 @@ public class CompanyRelationTableV1Service {
     }
 
     public TableDataInfo combinePage(JskCompanyRelationTableV1Dto dto) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/combinePage", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/combineMemberPage", BeanUtil.beanToMap(dto, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 }