From 86e3214d8e871aa903e24cda918aeae9080ffc16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 4 Nov 2022 10:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/FormulaRunServiceImpl.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
index 0887260a3..3f7e13f67 100644
--- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
+++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
@@ -49,7 +49,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
 
     private String runSQL(ExpressFormula expressFormula, List<FormulaVar> formulaVars) {
         if (isLog) {
-            log.info("SQL ExpressFormula {}, formulaVars {}", expressFormula, formulaVars);
+            log.info("SQL ExpressFormula {}", expressFormula);
         }
 
         //解析配置，获取返回值、数据源
@@ -81,7 +81,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
             sql = sql.replaceAll(formulaVar.getFieldId(), "'" + formulaVar.getContent() + "'");
         }
         if (isLog) {
-            log.info("sql run {}", sql);
+            log.info("ExpressFormula sql run {}", sql);
         }
 
         //外部数据源
@@ -105,10 +105,13 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
 
     private Object runFormula(ExpressFormula expressFormula, List<FormulaVar> formulaVars) throws Exception {
         if (isLog) {
-            log.info("FORMULA ExpressFormula {}, formulaVars {}", expressFormula, formulaVars);
+            log.info("FORMULA ExpressFormula {} {}", expressFormula.getFormula(), expressFormula.getFormulaRunScript());
         }
         DefaultContext<String, Object> context = new DefaultContext<String, Object>();
         formulaVars.forEach(v -> {
+            if (isLog) {
+                log.info("FORMULA formulaVar {} - {}", v.getFieldId(), v.getContent());
+            }
             if (DataType.NUMBER.equals(v.getFieldType()) && NumberUtils.isCreatable(v.getContent())) {
                 context.put(v.getFieldId(), new BigDecimal(v.getContent()));
             } else {