diff --git a/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java b/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java index 72dc1d3a..f9a1ac90 100644 --- a/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java +++ b/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java @@ -12,7 +12,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer @ServletComponentScan public class ApiAdminApplication extends SpringBootServletInitializer { - // + public static void main(String[] args) { SpringApplication application = new SpringApplication(ApiAdminApplication.class); application.addInitializers(new ToolApplicationContextInitializer()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index cfea64bb..72b73ad2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java @@ -109,7 +109,8 @@ public class HeartService { SpsSyncBusResponse spsSyncBusResponse = upBasicService.upAllBus(spsSyncDataRequest); if (CollUtil.isEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities()) && CollUtil.isEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities()) - && CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities())) { + && CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities()) + && CollUtil.isEmpty(spsSyncBusResponse.getEntrustReceEntities())) { return ResultVOUtils.success("无数据"); } BasicExportStatusEntity basicExportStatusEntity2 = basicExportService.findByData(ConstantStatus.SYNC_BUS_TYPE, 0); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java index f16c0f5c..a7ac6dd7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java @@ -316,8 +316,8 @@ public class UpBasicService { BeanUtils.copyProperties(spsSyncDataRequest, basicEntrustRecRequest); List dlEntrustReceEntities = entrustReceService.filterEntrustRec(basicEntrustRecRequest); if (CollUtil.isNotEmpty(dlEntrustReceEntities)) { - List temps = entrustReceService.filterEntrustRec(new BasicEntrustRecRequest()); - spsSyncBusResponse.setEntrustReceEntities(temps); +// List temps = entrustReceService.filterEntrustRec(new BasicEntrustRecRequest()); + spsSyncBusResponse.setEntrustReceEntities(dlEntrustReceEntities); } }