From f48e98cb11d614354d7dff8c14f96e1d466ef6a0 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 2 Mar 2023 14:51:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8F=91=E5=B7=A5=E8=B5=84=E5=8D=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/wrapper/SalaryTemplateWrapper.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index bd97476a7..45f0f1cea 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -382,6 +382,17 @@ public class SalaryTemplateWrapper extends Service { BeanUtils.copyProperties(po, salaryTemplateReplenishSetDTO); if (StringUtils.isNotEmpty(po.getReplenishSalaryItemSetting())) { replenishSalaryItemSetting = JsonUtil.parseList(po.getReplenishSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class); + // 同步补发薪资项目名称 + List itemPOS = getSalaryItemService(user).listAll(); + Map itemIdNameMap = SalaryEntityUtil.convert2Map(itemPOS, SalaryItemPO::getId, SalaryItemPO::getName); + if (CollectionUtils.isNotEmpty(replenishSalaryItemSetting)) { + replenishSalaryItemSetting.stream() + //排除人员消息 + .filter(data -> !StringUtils.equals(data.getGroupId(), "111111111111111111")) + .forEach(data -> { + data.getItems().forEach(item -> item.setName(itemIdNameMap.getOrDefault(Long.valueOf(item.getSalaryItemId()), item.getName()))); + }); + } } else { replenishSalaryItemSetting = getReplenishSalaryItemSet(replenishFormQueryParam.getSalarySobId()); }