From 8de418b28b33a96bf5e28b08525254361a7b7ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 6 Sep 2023 10:13:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/service/impl/FormulaRunServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
index 615c148eb..7b7ad36d2 100644
--- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
+++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
@@ -167,7 +167,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
                 isCustomFunction = StringUtils.equals(isCustomFunctionNode.asText().trim(), "1");
             }
         } catch (JsonProcessingException e) {
-            log.error("express execute fail, sql extendParam parse fail", e);
+            log.error("express execute fail, extendParam parse fail {}", extendParam, e);
         }
 
         if (isLog) {

From 1451c4b1924ac32463a2a92e7e4f51aada4d9dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 6 Sep 2023 10:14:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/FormulaRunServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
index 7b7ad36d2..ff08478b3 100644
--- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
+++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
@@ -155,6 +155,10 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
 
     private ExcelResult runFormula(ExpressFormula expressFormula, List<FormulaVar> formulaVars) {
 
+        if (isLog) {
+            log.info("FORMULA ExpressFormula {} {}", expressFormula.getFormula(), expressFormula.getFormulaRunScript());
+        }
+
         //是否是自定义函数
         boolean isCustomFunction = true;
 
@@ -170,10 +174,6 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
             log.error("express execute fail, extendParam parse fail {}", extendParam, e);
         }
 
-        if (isLog) {
-            log.info("FORMULA ExpressFormula {} {}", expressFormula.getFormula(), expressFormula.getFormulaRunScript());
-        }
-
         String formula = expressFormula.getFormulaRunScript();
 
         ExcelResult execute = new ExcelResult();