From 7336fad730f1863ab0c4b37570604912fe9e781e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 11 Feb 2025 11:47:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A8=E7=BA=BF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaxDeclarationValueServiceImpl.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java
index 2f5398655..ec0c11784 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java
@@ -451,6 +451,10 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
             result.put("证件号码", local.get("证件号码"));
             String no = local.getOrDefault("证件号码", "").toString();
             Map<String, Object> online = onlineNoMap.get(no);
+            if (online == null) {
+                log.warn("线上没有该条数据，请检查！证件号码：{}", no);
+                continue;
+            }
 
             taxReportColumns.stream().map(TaxReportColumnPO::getReportColumnName).forEach(col -> {
                 ContrastListDTO dto = new ContrastListDTO();
@@ -496,7 +500,7 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
         headerList.addAll((param.isOnlyShowDiffItem() ? finalOnlyShowColumns : columns).stream().collect(Collectors.toList()));
         resultList.put("columns", headerList);
         resultList.put("pageInfo", SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), oneResultList));
-        
+
         // 显示定制列
         List<WeaTableColumn> weaColumns = new ArrayList<>();
         weaColumns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "工号"), "工号"));
@@ -525,7 +529,7 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
         // 获取线下对比结果
         Map<String, Object> contrastMap = contrast(param);
         List<String> header = ((List<String>) contrastMap.get("columns"));
-        PageInfo<Map<String, Object>> pageInfo = (PageInfo<Map<String, Object>>)contrastMap.get("pageInfo");
+        PageInfo<Map<String, Object>> pageInfo = (PageInfo<Map<String, Object>>) contrastMap.get("pageInfo");
         List<Map<String, Object>> list = pageInfo.getList();
 
         List<WeaTableColumn> empInfoColumns = new ArrayList<>();