From 604d3d453e17de3c6e4370a6be3ea4c4c1e282af Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Wed, 18 May 2022 14:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 log/sdk.log                                  |  0
 src/com/engine/salary/biz/SIArchivesBiz.java |  2 +-
 src/com/engine/salary/biz/SISchemeBiz.java   | 11 ++++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 log/sdk.log

diff --git a/log/sdk.log b/log/sdk.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 6d0c8e7cd..c41059932 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -364,7 +364,7 @@ public class SIArchivesBiz {
             InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId);
             if (insuranceArchivesFundSchemePO == null) {
                 data.setEmployeeId(employeeId);
-                data.setUnderTake(UndertakerEnum.SCOPE_COMPANY);
+                data.setUnderTake(UndertakerEnum.SCOPE_PERSON);
             }
             return data;
         }finally {
diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java
index deca269e4..86c33d681 100644
--- a/src/com/engine/salary/biz/SISchemeBiz.java
+++ b/src/com/engine/salary/biz/SISchemeBiz.java
@@ -18,6 +18,7 @@ import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper;
 import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper;
 import com.engine.salary.util.SalaryAssert;
 import com.engine.salary.util.SalaryEnumUtil;
+import com.engine.salary.util.SalaryI18nUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.SqlSession;
@@ -240,6 +241,9 @@ public class
         try{
             //保存福利项目主表
             InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class);
+            List<InsuranceSchemePO> listResult = insuranceSchemeMapper.listByName(saveParam.getInsuranceScheme().getSchemeName());
+            SalaryAssert.isEmpty(listResult,  "该福利名称已经存在");
+
             InsuranceSchemePO insuranceSchemePO = InsuranceSchemeBO.convert2BatchPO(saveParam.getInsuranceScheme(), employeeId);
             insuranceSchemeMapper.insert(insuranceSchemePO);
             //日志
@@ -275,10 +279,11 @@ public class
                 throw new SalaryRunTimeException("福利方案不存在");
             }
 
-            //福利方案名称重复（待写）
+            //福利方案名称重复
             List<InsuranceSchemePO> insuranceSchemePOList = insuranceSchemeMapper.listByName(updateParam.getInsuranceScheme().getSchemeName());
-            if (CollectionUtils.isNotEmpty(insuranceSchemePOList)) {
-                throw new SalaryRunTimeException("福利方案名称重复");
+            if(CollectionUtils.isNotEmpty(insuranceSchemePOList)) {
+                boolean repeat = insuranceSchemePOList.stream().anyMatch(item -> !Objects.equals(item.getId(), updateParam.getInsuranceScheme().getId()));
+                SalaryAssert.isTrue(!repeat,"福利方案名称重复");
             }
 
             //更新福利方案主表