From 70a98b2b11b25c7a3b32c07cdc5043b60383220d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 23 Sep 2021 16:59:12 +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