From 3be7bd55ff0a4ab2ed25b46cdfd1dede92300ea3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Aug 2021 11:15:29 +0800
Subject: [PATCH] kafa数据从redis获取型号,当前组织下走航车设备列表

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