修改bug：

bug表1085，私有应收-非车	没有显示国任的非车

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -872,7 +872,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                             || invoiceType.equals(income.getInvoiceType()))
                     .collect(Collectors.toCollection(ArrayList::new));
             List<InsPlyIncomeDto> copyList = CollUtil.newArrayList();
-            if (CollUtil.isNotEmpty(incomeDtoList) && InvoiceTypeEnum.FEE_2.getCode().equals(invoiceType)){
+            if (CollUtil.isNotEmpty(incomeDtoList) && (StrUtil.isBlank(invoiceType) || InvoiceTypeEnum.FEE_2.getCode().equals(invoiceType))){
                 // 如果有发票类型为4的，则复制一条4的数据，完全一致，但发票类型为2
                 incomeDtoList.stream().filter(item -> InvoiceTypeEnum.FEE_4.getCode().equals(item.getInvoiceType())).forEach(item -> {
                     InsPlyIncomeDto incomeDto = new InsPlyIncomeDto();
@@ -903,11 +903,14 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             return resultList;
         }
 
-        // 如果status = 0或1，则直接返回空的filterIncomeList，如果status = 2，则查询所有ins_ply_follow_invoice_link表，过滤掉disableFlag为1 的，保留为0 的数据
-        List<InsPlyIncomeDto> filterIncomeList = insPlyIncomes.stream()
-                .filter(income -> "0".equals(income.getDisableFlag()))
-                .map(income -> BeanUtil.copyProperties(income, InsPlyIncomeDto.class))
-                .collect(Collectors.toList());
+        List<InsPlyIncomeDto> filterIncomeList = BeanUtil.copyToList(insPlyIncomes, InsPlyIncomeDto.class);
+        if ("2".equals(status)){
+            // 如果status = 0或1，则直接返回空的filterIncomeList，如果status = 2，则查询所有ins_ply_follow_invoice_link表，过滤掉disableFlag为1 的，保留为0 的数据
+            filterIncomeList = insPlyIncomes.stream()
+                    .filter(income -> "0".equals(income.getDisableFlag()))
+                    .map(income -> BeanUtil.copyProperties(income, InsPlyIncomeDto.class))
+                    .collect(Collectors.toList());
+        }
 
         // 5. 将其他费用收入合并进结果集合
         mergeOtherCostIncomeToResult(filterIncomeList, resultList, companyMap);