|
@@ -239,7 +239,7 @@ public class WorkerWarrantyLogic {
|
|
|
if (CollectionUtils.isNotEmpty(workerWarrantyListUp) && workerWarranty.getRefundAmount() != null)
|
|
|
workerWarranty.setRefundAmount(workerWarrantyListUp.get(0).getRefundAmount().add(workerWarranty.getRefundAmount()));
|
|
|
|
|
|
- workerWarranty.setWaitAmount(workerWarranty.getShouldAmount().subtract(workerWarranty.getPayableAmount()));
|
|
|
+ workerWarranty.setWaitAmount(workerWarranty.getShouldAmount().subtract(workerWarranty.getPayableAmount() == null?BigDecimal.ZERO:workerWarranty.getPayableAmount()));
|
|
|
workerWarranties.add(workerWarranty);
|
|
|
|
|
|
}
|