diff --git a/resource/WEB-INF/prop/hrmSalaryCustom.properties b/resource/WEB-INF/prop/hrmSalaryCustom.properties index 6294cc5c3..b873bc15e 100644 --- a/resource/WEB-INF/prop/hrmSalaryCustom.properties +++ b/resource/WEB-INF/prop/hrmSalaryCustom.properties @@ -1 +1 @@ -formulaRunOvertimeThreshold= \ No newline at end of file +formulaRunOvertimeThreshold=10 \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java index 37e8207b4..615c148eb 100644 --- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java +++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java @@ -48,7 +48,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService @Override public ExcelResult run(ExpressFormula expressFormula, List formulaVars, DataCollectionEmployee simpleEmployee) { - ExcelResult result = new ExcelResult(false, "", ""); + ExcelResult result = new ExcelResult(false, "", "公式类型异常!"); if (StringUtils.isNotBlank(formulaRunOvertimeThreshold)) { StopWatch stopWatch = new StopWatch(); stopWatch.start("run " + expressFormula.getName()); @@ -69,7 +69,6 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService result = runSQL(expressFormula, formulaVars); } } - log.error("express execute fail, {} not in ReferenceTypeEnum ", expressFormula.getReferenceType()); return result; }