属性值规则（规则组）

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/service/ValueRuleValidator.java.ftl

@@ -91,16 +91,20 @@ public class ValueRuleValidator implements ConstraintValidator<ValueRuleCheck, D
 
 <#comment>获取单项条件表达式</#comment>
 <#function getFieldCond fieldRule>
+    <#assign childRuleType=fieldRule.getCondType()>
     <#assign fieldCond="(" >
-    <#assign condBody="">
-    <#assign targetFieldName=fieldRule.getDEFName()><#comment>目标属性名称</#comment>
-    <#assign targetDEField=((de.getPSDEField(targetFieldName,true))!'')><#comment>目标属性</#comment>
-    <#assign targetDBValueOP=fieldRule.getCondOp()><#comment>表达式</#comment>
-    <#assign targetValue=((fieldRule.getParamValue())!'')><#comment>值项</#comment>
-    <#if targetDEField!=''>
-        <#assign targetFieldName=srfcaseformat(targetDEField.codeName,'l_u2lC')>
+    <#assign condBody="1==1">
+    <#comment>常规规则</#comment>
+    <#if childRuleType=='SIMPLE'>
+        <#assign targetFieldName=fieldRule.getDEFName()><#comment>目标属性名称</#comment>
+        <#assign targetDEField=((de.getPSDEField(targetFieldName,true))!'')><#comment>目标属性</#comment>
+        <#assign targetDBValueOP=fieldRule.getCondOp()><#comment>表达式</#comment>
+        <#assign targetValue=((fieldRule.getParamValue())!'')><#comment>值项</#comment>
+        <#if targetDEField!=''>
+            <#assign targetFieldName=srfcaseformat(targetDEField.codeName,'l_u2lC')>
+        </#if>
+        <#assign condBody="T(${pub.getPKGCodeName()}.util.helper.RuleUtils).test(#dto.get(\""+targetFieldName+"\"),\""+targetDBValueOP+"\","+"\""+targetValue+"\")">
     </#if>
-    <#assign condBody="T(${pub.getPKGCodeName()}.util.helper.RuleUtils).test(#dto.get(\""+targetFieldName+"\"),\""+targetDBValueOP+"\","+"\""+targetValue+"\")">
     <#assign fieldCond=fieldCond+condBody >
     <#assign fieldCond=fieldCond+")" >
     <#return fieldCond/>