From 659b91b554ba5e98b6fffa045231f5aa3fb4ab9e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 03 Sep 2021 15:21:48 +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