From 35bedb798dc6a84d1dd316ebd882ef1edb9f87f3 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 13 Sep 2021 16:24:30 +0800
Subject: [PATCH] 特殊设备添加guid字段，修改相关接口
---
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