From cecbd165080e69c57337d2e95eb6c2408cdd689a Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 4 Dec 2023 15:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E6=AD=A3=E5=B8=B8=E7=BC=B4?=
 =?UTF-8?q?=E7=BA=B3=E5=92=8C=E8=A1=A5=E7=BC=B4=E4=B8=AD=E6=9C=AA=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=BC=B4=E7=BA=B3=E7=9A=84=E7=A6=8F=E5=88=A9=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E5=AF=BC=E5=85=A5=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SIAccountServiceImpl.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 197fec018..6effb063f 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -1736,7 +1736,17 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                     } else {
                         //拼装待更新数据
                         encryptUtil.decryptList(list, InsuranceAccountDetailPO.class);
-                        updateInsuranceAccountDetailList.add(handleInsuranceAccountDetail(list.get(0), map));
+                        InsuranceAccountDetailPO updatePO = handleInsuranceAccountDetail(list.get(0), map);
+                        //判断导入福利项是否符合福利方案设置缴纳项
+                        if(!checkBalancePayInsurance(updatePO)) {
+                            isError = true;
+                            Map<String, String> errorMessageMap = Maps.newHashMap();
+                            errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(0,  "导入数据中存在福利档案中未设置的福利项缴纳数值！"));
+                            excelComments.add(errorMessageMap);
+                        } else {
+                            updateInsuranceAccountDetailList.add(updatePO);
+                        }
+
                     }
 
                 }