From 830304fabba9a8fd2b54a8b2b14826e66cc656da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 9 Jan 2023 14:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/sys/entity/vo/AppSettingVO.java       | 12 ++++++++++--
 .../service/impl/SalarySysConfServiceImpl.java   | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

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;
     }