修改bug：

bug1189，私有应收	跟单费开票，华泰为什么不显示保司，都是空的
bug1190，私有应收	跟单结算报表-保险公司报表，华泰的保险公司是空的

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

@@ -954,6 +954,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
         // 按companyName分组，组内year+month升序，最后打平
         resultList = resultList.stream()
+                .filter(x -> StrUtil.isNotBlank(x.getYear()) && StrUtil.isNotBlank(x.getMonth()))
                 // 按公司名称分组
                 .collect(Collectors.groupingBy(FollowCompanyFeeVO::getCompanyName))
                 // 获取分组后的value集合
@@ -1380,27 +1381,27 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         }
 
         // 第一步：批量查询 ptl_agreement 表，补全 partner_company_id
-        Set<String> agreementIds = records.stream()
-                .filter(r -> StrUtil.isNotBlank(r.getAgreementId()))
-                .map(InsPlyIncome::getAgreementId)
-                .collect(Collectors.toSet());
-        
-        Map<String, String> agreementPartnerCompanyMap = new HashMap<>();
-        if (CollUtil.isNotEmpty(agreementIds)) {
-            LambdaQueryWrapper<PtlAgreement> agreementWrapper = new LambdaQueryWrapper<>();
-            agreementWrapper.in(PtlAgreement::getId, agreementIds);
-            List<PtlAgreement> agreements = ptlAgreementMapper.selectList(agreementWrapper);
-            for (PtlAgreement agreement : agreements) {
-                agreementPartnerCompanyMap.put(agreement.getId(), agreement.getPartnerCompanyId());
-            }
-        }
-        
-        // 将 partner_company_id 设置到对应的 ins_ply_income 对象中
-        for (InsPlyIncome record : records) {
-            if (StrUtil.isNotBlank(record.getAgreementId())) {
-                record.setPartnerCompanyId(agreementPartnerCompanyMap.get(record.getAgreementId()));
-            }
-        }
+//        Set<String> agreementIds = records.stream()
+//                .filter(r -> StrUtil.isNotBlank(r.getAgreementId()))
+//                .map(InsPlyIncome::getAgreementId)
+//                .collect(Collectors.toSet());
+//
+//        Map<String, String> agreementPartnerCompanyMap = new HashMap<>();
+//        if (CollUtil.isNotEmpty(agreementIds)) {
+//            LambdaQueryWrapper<PtlAgreement> agreementWrapper = new LambdaQueryWrapper<>();
+//            agreementWrapper.in(PtlAgreement::getId, agreementIds);
+//            List<PtlAgreement> agreements = ptlAgreementMapper.selectList(agreementWrapper);
+//            for (PtlAgreement agreement : agreements) {
+//                agreementPartnerCompanyMap.put(agreement.getId(), agreement.getPartnerCompanyId());
+//            }
+//        }
+//
+//        // 将 partner_company_id 设置到对应的 ins_ply_income 对象中
+//        for (InsPlyIncome record : records) {
+//            if (StrUtil.isNotBlank(record.getAgreementId())) {
+//                record.setPartnerCompanyId(agreementPartnerCompanyMap.get(record.getAgreementId()));
+//            }
+//        }
 
         // 第二步：构建查询条件的唯一标识：year_month_companyId_partnerCompanyId
         Map<String, InsPlyIncome> keyMap = new HashMap<>();

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -2217,11 +2217,9 @@
         date(a.signing_time ) as sign_date,
         year(a.signing_time) as sign_year,
         month(a.signing_time) as sign_month,
-        b.partner_company_id,
-        (SELECT eic.name FROM esm_ins_company eic WHERE b.partner_company_id = eic.id AND eic.is_delete = 0) AS partnerCompanyName,
+        (SELECT eic.name FROM esm_ins_company eic WHERE a.partner_company_id = eic.id AND eic.is_delete = 0) AS partnerCompanyName,
         (SELECT eic.name FROM esm_ins_company eic WHERE a.company_id = eic.id AND eic.is_delete = 0) AS companyName
         FROM ins_ply_income a
-        LEFT JOIN ptl_agreement b ON a.agreement_id = b.id AND b.is_delete = 0
         <where>
             a.is_delete=0
             AND a.agreement_type = 2
@@ -2232,13 +2230,13 @@
                 AND a.system_code = #{query.systemCode}
             </if>
             <if test="query.companyId != null and query.companyId != ''">
-                AND b.partner_company_id = #{query.companyId}
+                AND a.partner_company_id = #{query.companyId}
             </if>
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                 AND a.create_time between #{query.startTime} and #{query.endTime}
             </if>
             <if test="query.companyIdList != null and query.companyIdList.size() > 0" >
-                AND b.partner_company_id in
+                AND a.partner_company_id in
                 <foreach collection="query.companyIdList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>