From 2c12b101715abcc2e03d99874d1c7334e284fbcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 13 Nov 2023 17:12:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=87=8F=E5=B0=91=E4=BA=BA=E5=91=98b?=
 =?UTF-8?q?ug=202=E3=80=81=E6=A1=A3=E6=A1=88=E9=A1=B9=E7=9B=AE=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SalaryAcctEmployeeServiceImpl.java  | 12 +++++++-----
 .../salary/wrapper/SalaryArchiveItemWrapper.java     |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index dff8d8578..514b82d74 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -291,11 +291,13 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listByParam(queryParam);
         Set<String> keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
         List<SalaryAcctEmployeePO> resultList = Lists.newArrayList();
-        lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> {
-            if (!keySet.contains(k)) {
-                resultList.add(v);
-            }
-        });
+        if(CollectionUtils.isNotEmpty(keySet)){
+            lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> {
+                if (!keySet.contains(k)) {
+                    resultList.add(v);
+                }
+            });
+        }
         return resultList;
     }
 
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
index a66a79011..42faf9c9b 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
@@ -111,6 +111,7 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt
                     Map<String, Object> salaryItemMap = new LinkedHashMap<>();
                     salaryItemMap.put("id", String.valueOf(m.getId()));
                     salaryItemMap.put("content", m.getName());
+                    salaryItemMap.put("dataType", m.getDataType());
                     return salaryItemMap;
                 }).collect(Collectors.toList());