‘linchangsheng’ преди 9 месеца
родител
ревизия
7d97caf4ee
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

@@ -233,7 +233,7 @@ public class WorkerWarrantyLogic {
                 }
             }
 
-            if (CollectionUtils.isNotEmpty(workerWarrantyListUp))
+            if (CollectionUtils.isNotEmpty(workerWarrantyListUp) && workerWarranty.getRefundAmount() != null)
                 workerWarranty.setRefundAmount(workerWarrantyListUp.get(0).getRefundAmount().add(workerWarranty.getRefundAmount()));
 
             workerWarranties.add(workerWarranty);