From 3a1ac7ca9392dce529417a07734ceed0e357c0e7 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Mon, 6 Jun 2022 11:43:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=88=86=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/wrapper/SalarySendWrapper.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java
index 338831f3e..96655cf72 100644
--- a/src/com/engine/salary/wrapper/SalarySendWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java
@@ -277,6 +277,7 @@ public class SalarySendWrapper extends Service {
         if (queryParam.getSendStatus() != null) {
             queryParam.setSendStatusVal(queryParam.getSendStatus().getValue());
         }
+        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         PageInfo<SalarySendInfoListDTO> pageInfo = getSalarySendService(user).salarySendInfoListPage(queryParam);
         List<SalarySendInfoListDTO> list = pageInfo.getList();
         list.forEach(e -> {
@@ -481,6 +482,7 @@ public class SalarySendWrapper extends Service {
         List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySend.getSalarySobId()));
         List<SalaryTemplateSalaryItemListDTO> salaryItems = getSalarySendService(user).getSalaryItemsSetting(CollectionUtils.isNotEmpty(salaryTemplates) ? salaryTemplates.get(0) : null);
 
+        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
         // 2.获取基本数据
         PageInfo<SalarySendDetailListDTO> pageInfo = getSalarySendService(user).salarySendInfoDetailListPage(queryParam);
 

From b20a6e4cbf05368ac1db13e9ffb518571aecabdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 6 Jun 2022 19:24:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/SalarySobServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
index 2f61a600a..ab15f0093 100644
--- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
@@ -35,6 +35,7 @@ import weaver.hrm.User;
 
 import java.time.YearMonth;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -216,7 +217,12 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
         // 5、保存
         SalarySobItemBO.Result result = SalarySobItemBO.initSalarySobItem(salarySobPO.getId(), salarySobDefaultItemGroupPOS, salarySobDefaultItemPOS, defaultSalaryItemPOS, (long) user.getUID(), SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
         if (CollectionUtils.isNotEmpty(result.getNeedInsertSalarySobItems())) {
-            salarySobItemService.batchInsert(result.getNeedInsertSalarySobItems());
+
+            List<SalarySobItemPO> list = new ArrayList<>(result.getNeedInsertSalarySobItems().stream()
+                    .collect(Collectors.toMap(SalarySobItemPO::getSalaryItemId, Function.identity(), (oldValue, newValue) -> oldValue))
+                    .values());
+
+            salarySobItemService.batchInsert(list);
         }
         if (CollectionUtils.isNotEmpty(result.getNeedInsertSalarySobItemGroups())) {
             salarySobItemGroupService.batchInsert(result.getNeedInsertSalarySobItemGroups());