diff --git a/src/com/engine/salary/sys/entity/vo/AppSettingVO.java b/src/com/engine/salary/sys/entity/vo/AppSettingVO.java index 9a1175ca5..7a471a10b 100644 --- a/src/com/engine/salary/sys/entity/vo/AppSettingVO.java +++ b/src/com/engine/salary/sys/entity/vo/AppSettingVO.java @@ -20,6 +20,11 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class AppSettingVO { + /** + * 版本号 + */ + private String version; + /** * 是否打印日志 * @@ -44,12 +49,15 @@ public class AppSettingVO { */ private String isOpenTaxDeclaration; - - /** * 是否显示脱敏表人员信息 * @see OpenEnum */ private String displayEmpInfoReport; + /** + * 打开修改系统公式 + */ + private String openFormulaForcedEditing; + } diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 468ff155c..2305b551f 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -472,12 +472,22 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe appSettingVO.setIsOpenEncrypt(OpenEnum.OPEN.getValue()); } - /** - * 默认不显示 - */ + //是否显示脱敏表人员信息 if (StringUtils.isEmpty(appSettingVO.getDisplayEmpInfoReport())) { appSettingVO.setDisplayEmpInfoReport(OpenEnum.OFF.getValue()); } + + BaseBean baseBean = new BaseBean(); + //是否打印 + String log = baseBean.getPropValue("hrmSalary", "log"); + appSettingVO.setIsLog(log); + //当前版本号 + String version = baseBean.getPropValue("hrmSalary", "version"); + appSettingVO.setVersion(version); + //是否开启了强制修改公式 + String openFormulaForcedEditing = baseBean.getPropValue("hrmSalary", "openFormulaForcedEditing"); + appSettingVO.setOpenFormulaForcedEditing(openFormulaForcedEditing); + return appSettingVO; }