Merge branch 'feature/cpy_splite' into test

2 years ago · 929e11929a
parent 9287cdb4b6 8c8dc4397b
commit 929e11929a
1 changed files with 1 additions and 1 deletions
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
@ -197,7 +197,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                }
            }
            if(CollectionUtils.isEmpty(cpyOrderItems)||CollectionUtils.isEmpty(nocpyOrderItems)){
-                commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems);
+                commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:cpyOrderItems);
                commonOrderInfoList.add(commonOrderInfo);
            }else {
                //封装成品油