From da159a25eeb9d5c9eb05e85e60972303d5d6b87d Mon Sep 17 00:00:00 2001
From: xiangerlin <251481237@qq.com>
Date: Thu, 3 Jul 2025 18:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CInvoiceImportPluginServiceImpl.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java
index 38be6012..78394b85 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java
@@ -70,13 +70,21 @@ public class CInvoiceImportPluginServiceImpl implements ICInvoiceImportPluginSer
     @Override
     public String importInvoice(JSONObject requestJson) throws Exception {
 
+        //可能是定时任务，也可能是事件触发
 
+        //如果是触发的方式，从jsonStr里取
+        JSONObject jsonStrObj = requestJson.getJSONObject("jsonStr");
         //1、 查OA主表
         String dataSourceCode = requestJson.getString("sourceCode");
         if (StrUtil.isEmpty(dataSourceCode)) {
             dataSourceCode = requestJson.getString("apiDataSourceCode");
         }
         String id = requestJson.getString("id");//主表id 测试的时候用
+        if (StrUtil.isEmpty(id)){
+            if (null != jsonStrObj){
+                id = jsonStrObj.getString("id");
+            }
+        }
         String start_date_start = requestJson.getString("start_date_start");
         String start_date_end = requestJson.getString("start_date_end");
         CInvoiceImportHEntity importHEntity = new CInvoiceImportHEntity();