diff --git a/src/main/java/com/management/controller/InvoiceController.java b/src/main/java/com/management/controller/InvoiceController.java index 296041d..fe9fa70 100644 --- a/src/main/java/com/management/controller/InvoiceController.java +++ b/src/main/java/com/management/controller/InvoiceController.java @@ -732,6 +732,7 @@ public class InvoiceController { JSONObject getInvoice = crmRequestUtil.getCRMList(Arrays.asList( //new Filter("EQ", "name", Arrays.asList("2025-06-14-0005")), new Filter("EQ", "life_status", Arrays.asList("invalid")), + new Filter("ISN", "erp_id__c", Arrays.asList("")), new Filter("GT", "last_modified_time", Arrays.asList(String.valueOf(twoDaysAgo))) ), "InvoiceApplicationObj"); diff --git a/src/main/java/com/management/controller/PreContractController.java b/src/main/java/com/management/controller/PreContractController.java index ead82e3..5bf7047 100644 --- a/src/main/java/com/management/controller/PreContractController.java +++ b/src/main/java/com/management/controller/PreContractController.java @@ -648,9 +648,13 @@ public class PreContractController { log.info("没有集成过,将继续向下执行"); - long documentDate = preContractData.getLong("document_date__c"); + long documentDate = preContractData.getLong("document_date__c") != null ? preContractData.getLong("document_date__c") : 0; - Date date = new Date(documentDate); + Date date = null; + + if (documentDate != 0) { + date = new Date(documentDate); + } //开始封装传输至ERP的请求 Map erpContractReq = new HashMap<>();