From 67dd48a88e5efd1d92791fa5632cf552d6c01eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= <sci3197@dingtalk.com>
Date: Thu, 21 Dec 2023 09:31:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=94=80=E9=A1=B9?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/erp/service/impl/ImageSubmitServiceImpl.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
index 832f1308..8c347040 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
@@ -69,8 +69,14 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         QueryWrapper<SdnyTDxRecordInvoice> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("uuid", uuidList);
         List<SdnyTDxRecordInvoice> invoicesList = tdxRecordInvoiceDao.selectList(queryWrapper);
+        List<String> recordUuidList = null;
         QueryWrapper<SdnyTDxSaleRecordInvoice> salesQueryWrapper = new QueryWrapper<>();
         salesQueryWrapper.in("uuid", uuidList);
+        if (invoicesList != null && invoicesList.size() > 0) {
+            recordUuidList = invoicesList.stream().map(SdnyTDxRecordInvoice::getUuid).collect(Collectors.toList());
+            salesQueryWrapper.notIn("uuid", recordUuidList);
+        }
+        salesQueryWrapper.notIn("uuid", uuidList);
         List<SdnyTDxSaleRecordInvoice> saleInvoices = sdnyTDxSaleRecordInvoiceDao.selectList(salesQueryWrapper);
         if (saleInvoices!=null && saleInvoices.size()>0) {
             if (invoicesList == null || invoicesList.size() == 0) {
@@ -102,7 +108,10 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         List<SdnyTDxRecordInvoiceDetail> detailList = detailDao.selectList(detailQueryWrapper);
         if (saleInvoices != null && saleInvoices.size()>0) {
             QueryWrapper<SdnyTDxRecordInvoiceDetailSales> salesDetailQueryWrapper = new QueryWrapper<>();
-            salesQueryWrapper.in("uuid", uuidList);
+            salesDetailQueryWrapper.in("uuid", uuidList);
+            if (recordUuidList != null && recordUuidList.size() > 0) {
+                salesDetailQueryWrapper.notIn("uuid", recordUuidList);
+            }
             List<SdnyTDxRecordInvoiceDetailSales> salesDetailList = detailSalesDao.selectList(salesDetailQueryWrapper);
             if (detailList == null || detailList.size() == 0) {
                 detailList = new ArrayList<>();