From fc2a0bcab816796547cccb9ec746a54b16b6a34b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 14:27:40 +0800
Subject: [PATCH] screen-api                  myabtisPLUS版本降级

---
 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