From 0ace75ab06b8d691bef7f74d79c061b21988ebe5 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 16 Dec 2022 14:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/wrapper/SalarySendWrapper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index e5f7e77aa..fe7a07a22 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -119,12 +119,11 @@ public class SalarySendWrapper extends Service { Optional optional = salaryTemplates.stream().filter(s -> s.getSalarySobId().equals(e.getSalarySobId())).findFirst(); if (optional.isPresent()) { // todo 目前就一个回算,那么没有冻结且是回算,就展示补发名称 - e.setTemplate(optional.get().getName()); + e.setTemplate(NumberUtils.INTEGER_ONE.equals(e.getSalaryAcctType()) ? optional.get().getReplenishName() : optional.get().getName()); e.setTemplateId(optional.get().getId()); } }); } - List columns = buildWeaTableColumns(); WeaTable table = new WeaTable(); table.setColumns(columns);