|
@@ -1272,7 +1272,12 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- data = data2.substring(0,data2.length()-1);
|
|
|
+ if(!data2.isEmpty()){
|
|
|
+ data = data2.substring(0,data2.length()-1);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ data =Expression.parse(formula.getFormula()).calculate(currentMap);
|
|
|
+ }
|
|
|
}else{
|
|
|
data =Expression.parse(formula.getFormula()).calculate(currentMap);
|
|
|
}
|