From 722908f2d4e449cf2b52504c7abf98fc2a2a0a9e Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Thu, 12 Dec 2024 12:30:59 +0100
Subject: [PATCH] Add extra fees empty list check

---
 .../domain/shippingInvoice/ShippingInvoiceFactory.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/shippingInvoice/ShippingInvoiceFactory.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/shippingInvoice/ShippingInvoiceFactory.java
index 44601db9f..f132a8fdc 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/shippingInvoice/ShippingInvoiceFactory.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/shippingInvoice/ShippingInvoiceFactory.java
@@ -262,7 +262,7 @@ public class ShippingInvoiceFactory {
         if (savRefunds != null) {
             updateSavRefundsInDb(savRefunds, invoiceCode);
         }
-        if(extraFees != null) {
+        if(extraFees != null && !extraFees.isEmpty()) {
             List<String> extraFeesIds = extraFees.stream().map(ExtraFeeResult::getId).collect(toList());
             extraFeeService.updateInvoiceNumberByIds(extraFeesIds, invoiceCode);
         }
@@ -398,7 +398,7 @@ public class ShippingInvoiceFactory {
         if (savRefunds != null) {
             updateSavRefundsInDb(savRefunds, invoiceCode);
         }
-        if(extraFees != null) {
+        if(extraFees != null && !extraFees.isEmpty()) {
             List<String> extraFeesIds = extraFees.stream().map(ExtraFeeResult::getId).collect(toList());
             extraFeeService.updateInvoiceNumberByIds(extraFeesIds, invoiceCode);
         }
@@ -587,7 +587,7 @@ public class ShippingInvoiceFactory {
         if (savRefunds != null) {
             updateSavRefundsInDb(savRefunds, invoiceCode);
         }
-        if(extraFees != null) {
+        if(extraFees != null && !extraFees.isEmpty()) {
             List<String> extraFeesIds = extraFees.stream().map(ExtraFeeResult::getId).collect(toList());
             extraFeeService.updateInvoiceNumberByIds(extraFeesIds, invoiceCode);
         }