Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

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

@@ -3919,10 +3919,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             return CollUtil.newArrayList();
         }
         if (StrUtil.isBlank(followInvoicePageListVo.getSearchList().stream().filter(search -> "signYear".equals(search.getName())).findAny().get().getSearch())){
-            return CollUtil.newArrayList();
+            throw new SystemException("请选择年份！");
         }
         if (!StrUtil.contains(followInvoicePageListVo.getSearchList().stream().filter(search -> "signYear".equals(search.getName())).findAny().get().getSearch(), ",")){
-            return CollUtil.newArrayList();
+            throw new SystemException("请选择年份！");
         }
         FollowInvoicePageListVo.SearchVO searchYear = followInvoicePageListVo.getSearchList().stream().filter(search -> "signYear".equals(search.getName())).findFirst().orElse(new FollowInvoicePageListVo.SearchVO());
         Integer startYear = Integer.parseInt(searchYear.getSearch().split(",")[0]);
@@ -3950,8 +3950,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                         .collect(Collectors.toMap(FollowInvoicePageListVo.SearchVO::getName, Function.identity(), (oldItem, newItem) -> oldItem));
                 Set<String> names = searchVOMap.keySet();
 
-                // 保险公司
-                Predicate<InsPlyIncomeDto> companyIdPredicate = insPlyIncome -> {
+                // 分支保险公司
+                Predicate<InsPlyIncomeDto> partnerCompanyIdPredicate = insPlyIncome -> {
                     if (!names.contains(FollowInvoicePageListVo.SearchVO.companyId)) {
                         return true;
                     }
@@ -3966,21 +3966,21 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     }
                     if ("等于".equalsIgnoreCase(type) || "包含".equalsIgnoreCase(type)) {
                         List<String> companyIds = Arrays.asList(search.split(","));
-                        return companyIds.contains(insPlyIncome.getCompanyId());
+                        return companyIds.contains(insPlyIncome.getPartnerCompanyId());
                     }
                     if ("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)) {
                         List<String> companyIds = Arrays.asList(search.split(","));
-                        return !companyIds.contains(insPlyIncome.getCompanyId());
+                        return !companyIds.contains(insPlyIncome.getPartnerCompanyId());
                     }
                     return true;
                 };
 
                 // AND / OR 组合逻辑（和代码A完全一致）
                 if ("and".equalsIgnoreCase(followInvoicePageListVo.getLogicJudge())) {
-                    Predicate<InsPlyIncomeDto> and = companyIdPredicate;
+                    Predicate<InsPlyIncomeDto> and = partnerCompanyIdPredicate;
                     filterIncomes = incomes.stream().filter(and).toList();
                 } else if ("or".equalsIgnoreCase(followInvoicePageListVo.getLogicJudge())) {
-                    Predicate<InsPlyIncomeDto> or = companyIdPredicate;
+                    Predicate<InsPlyIncomeDto> or = partnerCompanyIdPredicate;
                     filterIncomes = incomes.stream().filter(or).toList();
                 }
             }