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 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 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 extraFeesIds = extraFees.stream().map(ExtraFeeResult::getId).collect(toList()); extraFeeService.updateInvoiceNumberByIds(extraFeesIds, invoiceCode); }