From fbc49bff98dc22150b97b74e686d8080d0fe392b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 12 Oct 2023 13:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=8F=E5=8F=98=E9=87=8F=E4=B8=BA?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=97=B6=E8=BF=94=E5=9B=9E=E2=80=9D=E2=80=9D?= =?UTF-8?q?number=E8=BF=94=E5=9B=9E0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salaryacct/bo/ExpressFormulaBO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/ExpressFormulaBO.java b/src/com/engine/salary/entity/salaryacct/bo/ExpressFormulaBO.java index a0767e492..29e0f0ea5 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/ExpressFormulaBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/ExpressFormulaBO.java @@ -98,8 +98,10 @@ public class ExpressFormulaBO { // 公式变量的值 String formulaVarValue = formulaVarValueMap.getOrDefault(formulaVar.getFieldId(), StringUtils.EMPTY); // 如果公式的返回值类型为number，公式中的变量的值如果为空，公式运行的时候会报错，所以需要替换成0 - if (StringUtils.isEmpty(formulaVarValue) && "number".equals(expressFormula.getReturnType())) { + if (StringUtils.isEmpty(formulaVarValue) && "number".equals(formulaVar.getFieldType())) { formulaVarValue = BigDecimal.ZERO.toPlainString(); + } else if (StringUtils.isEmpty(formulaVarValue) && "string".equals(formulaVar.getFieldType())) { + formulaVarValue = ""; } formulaVar.setContent(formulaVarValue); }