From cfd393ccb56a42f67ffaa35ed0887061ad0f2e66 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Aug 2021 15:06:20 +0800
Subject: [PATCH] 密码校验规则变更

---
 screen-common/src/main/java/com/moral/util/UnitConvertUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
index 5bdf91f..7d918da 100644
--- a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
+++ b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
@@ -31,7 +31,7 @@
             */
     public static String calculate(String value, String formula) {
         if(ObjectUtils.isEmpty(formula))
-            return value;
+            return null;
         ScriptEngine jse = new ScriptEngineManager().getEngineByName("JavaScript");
         formula = formula.replaceAll("\\{0\\}", value);
         Double result = null;

--
Gitblit v1.8.0