From 19c297dfe98088db16a76fb637a720a032be53fc Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Thu, 20 Jul 2023 15:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B1=95=E7=A4=BA=E5=90=8Dfix=E8=A1=A5?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryBill/dto/SalaryTemplateReplenishFormDTO.java     | 3 ++-
 src/com/engine/salary/wrapper/SalaryTemplateWrapper.java   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateReplenishFormDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateReplenishFormDTO.java
index 50bc76ba8..0e90569db 100644
--- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateReplenishFormDTO.java
+++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateReplenishFormDTO.java
@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Harryxzy
@@ -27,6 +28,6 @@ public class SalaryTemplateReplenishFormDTO {
     private List<SalaryTemplateSalaryItemSetListDTO> replenishSalaryTemplateSalaryItemSet;
 
     // 工资单项目名称设置
-    private List<SalaryBillItemNameDTO> salaryBillItemNameSet;
+    private Map<Long, SalaryBillItemNameDTO> salaryBillItemNameSet;
 
 }
diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
index dbb8b521f..0b4eefaef 100644
--- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
@@ -411,7 +411,7 @@ public class SalaryTemplateWrapper extends Service {
         // 补发薪资项目设置
         List<SalaryTemplateSalaryItemSetListDTO> replenishSalaryItemSetting;
         // 补发薪资项目显示名称
-        List<SalaryBillItemNameDTO> salaryBillItemNameDTOS = new ArrayList<>();
+        Map<Long, SalaryBillItemNameDTO> salaryBillItemNameDTOMap = new HashMap<>();
         if (id != null) {
             SalaryTemplatePO po = getSalaryTemplateService(user).getById(id);
             if (po == null) {
@@ -427,7 +427,8 @@ public class SalaryTemplateWrapper extends Service {
                 List<SalaryBillItemNamePO> billItemNameList = getSalaryBillItemNameService(user).ListByTemplateAndType(SalaryBillItemNamePO.builder().salaryTemplateId(id).salaryBillType(1).build());
                 Map<Long, String> itemShowNameMap = SalaryEntityUtil.convert2Map(billItemNameList, SalaryBillItemNamePO::getSalaryItemId, SalaryBillItemNamePO::getSalaryItemShowName);
                 // 获取薪资项目信息
-                salaryBillItemNameDTOS = SalaryBillItemNameBO.convert2ListDTO(billItemNameList, itemIdNameMap);
+                List<SalaryBillItemNameDTO> salaryBillItemNameDTOS = SalaryBillItemNameBO.convert2ListDTO(billItemNameList, itemIdNameMap);
+                salaryBillItemNameDTOMap = SalaryEntityUtil.convert2Map(salaryBillItemNameDTOS, SalaryBillItemNameDTO::getSalaryItemId);
 
                 if (CollectionUtils.isNotEmpty(replenishSalaryItemSetting)) {
                     replenishSalaryItemSetting.stream()
@@ -455,7 +456,7 @@ public class SalaryTemplateWrapper extends Service {
         return SalaryTemplateReplenishFormDTO.builder()
                 .id(id)
                 .replenishSalaryTemplateSalaryItemSet(replenishSalaryItemSetting)
-                .salaryBillItemNameSet(salaryBillItemNameDTOS)
+                .salaryBillItemNameSet(salaryBillItemNameDTOMap)
                 .build();
     }