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

commons/src/main/java/com/jzg/commons/util/OrderComponents.java

@@ -64,7 +64,15 @@ public class OrderComponents {
         nameMap.put("order.dockingPerson","对接人姓名");
         nameMap.put("order.dockingPersonPhone","对接人手机号");
 
-
+        nameMap.put("insCompanyVo[0].companyCode","保司编码");
+        nameMap.put("insCompanyVo[0].nameSimple","保司简称");
+        nameMap.put("insCompanyVo[0].code","保司代码");
+        nameMap.put("insCompanyVo[0].cnName","保司代码");
+        nameMap.put("insCompanyVo[0].name","保司全称");
+        nameMap.put("insCompanyVo[0].logo","保司logo");
+        nameMap.put("insCompanyVo[0].id","保司ID");
+        nameMap.put("order.companyName","保司名称");
+        nameMap.put("order.insuranceCompanyCode","保司ID");
 
         return nameMap;
     }

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

@@ -322,16 +322,17 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if (b.getCreateTime() == null) return -1;
             return b.getCreateTime().compareTo(a.getCreateTime());
         });
-
-        // 收支状态筛选（在排序后、分组前进行）
-//        if (param.getIncomeAndExpense() != null && !param.getIncomeAndExpense().isEmpty()) {
-//            allRecords = allRecords.stream()
-//                    .filter(record -> param.getIncomeAndExpense().equals(record.getIncomeAndExpense()))
-//                    .collect(Collectors.toList());
-//        }
-
         // 按月份分组统计
         Map<String, IncomeAndExpenseVo.IncomeAndExpense> monthSummaryMap = new TreeMap<>(Collections.reverseOrder());
+        if(CollUtil.isEmpty(allRecords)){
+            IncomeAndExpenseVo.IncomeAndExpense summary = monthSummaryMap.get(key);
+            summary = new IncomeAndExpenseVo.IncomeAndExpense();
+            summary.setMonth(key);
+            summary.setIncome(BigDecimal.ZERO);
+            summary.setExpense(BigDecimal.ZERO);
+            summary.setBalance(BigDecimal.ZERO);
+            monthSummaryMap.put(key, summary);
+        }
         for (IncomeAndExpenseList record : allRecords) {
             if (record.getCreateTime() == null) continue;
             // 获取或创建月度汇总对象
@@ -344,7 +345,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 summary.setBalance(BigDecimal.ZERO);
                 monthSummaryMap.put(key, summary);
             }
-
             // 更新收入或支出
             if ("0".equals(record.getIncomeAndExpense())) {
                 // 收入