Browse Source

完善条件ID构建

youseries 7 years ago
parent
commit
b97a1418a8

+ 4 - 1
urule-core/src/main/java/com/bstek/urule/model/rule/CommonFunctionValue.java

@@ -33,7 +33,10 @@ public class CommonFunctionValue extends AbstractValue{
 	@Override
 	@Override
 	public String getId() {
 	public String getId() {
 		if(id==null){
 		if(id==null){
-			id= "[函数]"+label+"("+parameter.getId()+")";			
+			id= "[函数]"+label+"("+parameter.getId()+")";
+			if(arithmetic!=null){
+				id=id+arithmetic.getId();
+			}
 		}
 		}
 		return id;
 		return id;
 	}
 	}

+ 3 - 0
urule-core/src/main/java/com/bstek/urule/model/rule/ParenValue.java

@@ -27,6 +27,9 @@ public class ParenValue extends AbstractValue {
 			id+=value.getId();
 			id+=value.getId();
 		}
 		}
 		id+=")";
 		id+=")";
+		if(arithmetic!=null){
+			id=id+arithmetic.getId();
+		}
 		return id;
 		return id;
 	}
 	}
 	@Override
 	@Override