|
|
@@ -342,6 +342,7 @@ public class FormulaController {
|
|
|
formulaIfElse.setSymbol(s3);
|
|
|
formulaIfElse.setParameter2(split2[1]);
|
|
|
formulaIfElse.setGroupTerm(groupSymbol);
|
|
|
+ groupSymbol = null;
|
|
|
formulaIfElses.add(formulaIfElse);
|
|
|
}
|
|
|
}
|
|
|
@@ -372,6 +373,8 @@ public class FormulaController {
|
|
|
s = ">";
|
|
|
}else if (str.contains("<") && !str.contains("=")){
|
|
|
s = "<";
|
|
|
+ }else if (str.contains("!=")){
|
|
|
+ s = "!=";
|
|
|
}else if (str.contains("=")){
|
|
|
s = "=";
|
|
|
}
|