Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/service/impl/HlwCompanyAccountDetailServiceImpl.java

@@ -343,12 +343,14 @@ public class HlwCompanyAccountDetailServiceImpl extends ServiceImpl<HlwCompanyAc
             paymentQueryWrapper.eq("subcontractor_id", hlwCompanyAccount.getSubcontractorId());
             paymentQueryWrapper.eq("is_through_platform", 0);
             List<HlwPayment> paymentList = hlwPaymentService.list(paymentQueryWrapper);
-            //待支付付款单
-            noPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(1)).collect(Collectors.toList());
-            //支付中付款单
-            onPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(2)).collect(Collectors.toList());
-            //已支付付款单
-            alPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(3)).collect(Collectors.toList());
+            if (paymentList != null && paymentList.size() > 0) {
+                //待支付付款单
+                noPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(1)).collect(Collectors.toList());
+                //支付中付款单
+                onPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(2)).collect(Collectors.toList());
+                //已支付付款单
+                alPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(3)).collect(Collectors.toList());
+            }
         } else {
             queryWrapper.eq("cp_id", hlwCompanyAccount.getSubcontractorId());
             //服务商数据统计
@@ -366,12 +368,14 @@ public class HlwCompanyAccountDetailServiceImpl extends ServiceImpl<HlwCompanyAc
             paymentQueryWrapper.eq("company_id", hlwCompanyAccount.getCompanyId());
             paymentQueryWrapper.eq("is_through_platform", 1);
             List<HlwPayment> paymentList = hlwPaymentService.list(paymentQueryWrapper);
-            //待支付付款单
-            noPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(1)).collect(Collectors.toList());
-            //支付中付款单
-            onPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(2)).collect(Collectors.toList());
-            //已支付付款单
-            alPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(3)).collect(Collectors.toList());
+            if (paymentList != null && paymentList.size() > 0) {
+                //待支付付款单
+                noPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(1)).collect(Collectors.toList());
+                //支付中付款单
+                onPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(2)).collect(Collectors.toList());
+                //已支付付款单
+                alPaymentList = paymentList.stream().filter(item -> item.getStatus().equals(3)).collect(Collectors.toList());
+            }
         }
         //待支付付款单遍历
         for (HlwPayment hlwPayment : noPaymentList) {