From 2f0c2b39ce916bb1321fa95e6af4dbd17bdc2e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 24 Mar 2025 09:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E7=A6=8F=E4=BA=8C=E5=BC=80=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E6=AC=A1=E6=A0=B8=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/bo/SalaryAcctRecordBO.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index 017ad9126..3b09a985d 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -87,14 +87,16 @@ public class SalaryAcctRecordBO { if (approvalCanReCalc || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) { btnList.add(new WeaTableOperate("重新核算", null, "4")); } - if(salaryAcctRecordPO.getBackCalcStatus() == null || salaryAcctRecordPO.getBackCalcStatus() == NumberUtils.INTEGER_ZERO) { - btnList.add(new WeaTableOperate("回算", null, "5")); - } + btnList.add(new WeaTableOperate("核算", null, "0")); +// if(salaryAcctRecordPO.getBackCalcStatus() == null || salaryAcctRecordPO.getBackCalcStatus() == NumberUtils.INTEGER_ZERO) { +// btnList.add(new WeaTableOperate("回算", null, "5")); +// } } else { btnList.add(new WeaTableOperate("查看", null, "3")); if (approvalCanReCalc || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) { btnList.add(new WeaTableOperate("重新核算", null, "4")); } + btnList.add(new WeaTableOperate("核算", null, "0")); } return SalaryAcctRecordListDTO.builder() .id(salaryAcctRecordPO.getId())