From 35ba4ce6b50c2d72b4614b882fb78b9d2e577d01 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 4 Jul 2025 13:47:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E4=B9=8B=E9=AB=98=20=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salarysob/dto/SalaryApprovalDTO.java | 2 ++ .../salary/service/impl/SalaryApprovalRuleServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/com/engine/salary/entity/salarysob/dto/SalaryApprovalDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalaryApprovalDTO.java index 143d98fca..0f2603b61 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalaryApprovalDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalaryApprovalDTO.java @@ -38,6 +38,8 @@ public class SalaryApprovalDTO { private Boolean canEdit; + private Boolean hideEdit; + /** * 审批项目信息分组形式 */ diff --git a/src/com/engine/salary/service/impl/SalaryApprovalRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalaryApprovalRuleServiceImpl.java index 648a08b79..1972d15c2 100644 --- a/src/com/engine/salary/service/impl/SalaryApprovalRuleServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryApprovalRuleServiceImpl.java @@ -28,6 +28,7 @@ import com.engine.salary.util.valid.ValidUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; +import weaver.general.BaseBean; import weaver.hrm.User; import java.util.Collection; @@ -196,6 +197,10 @@ public class SalaryApprovalRuleServiceImpl extends Service implements SalaryAppr SalaryApprovalDTO salaryApprovalDTO = SalaryApprovalBO.convert2DTO(approvalRulePO, salaryItemList); // 查询是否可以核算、编辑(默认开启) salaryApprovalDTO.setCanEdit(getRecordIsCanEdit(acctRecordPO)); + + BaseBean baseBean = new BaseBean(); + String hideEdit = baseBean.getPropValue("mzgSalaryReport", "hide_edit_buttom"); + salaryApprovalDTO.setHideEdit(StringUtils.isNotBlank(hideEdit) && "true".equals(hideEdit)); return salaryApprovalDTO; }