From aefb5929bf574914740c8ff7ddf7f383c64841f2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 30 Sep 2021 14:41:39 +0800
Subject: [PATCH] 通过组织id和guids获取指定日期国控站点周围设备AQI六参数据、站点平均数据、AQI、首要污染物接口;获取AQI和首要污染物工具类

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