补充值规则异常信息

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/annotation/ValueRuleCheck.java.ftl

@@ -31,7 +31,7 @@ public @interface ValueRuleCheck {
 
     Class<? extends Payload>[] payload() default {};
 
-    @Target({FIELD, METHOD, PARAMETER, ANNOTATION_TYPE})
+    @Target({TYPE_USE})
     @Retention(RUNTIME)
     @Documented
     @interface List {

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

@@ -65,9 +65,11 @@ public class ValueRuleValidator implements ConstraintValidator<ValueRuleCheck, D
                             <#assign ruleName=(de.codeName+"_"+deRule.getPSDEField().codeName+"_"+deRule.codeName)?lower_case>
                             <#assign ruleCond=getGroupCond(group)>
                             <#assign ruleMessage=getGroupMessage(group)>
+                            <#if ruleCond!="">
         sysRule.put("${ruleName}", new ValueRule("${ruleCond}","${ruleMessage}"));
                             </#if>
                         </#if>
+                    </#if>
                 </#list>
                 </#if>
             </#list>
@@ -80,7 +82,7 @@ public class ValueRuleValidator implements ConstraintValidator<ValueRuleCheck, D
 
 <#comment>获取组条件表达式</#comment>
 <#function getGroupCond group>
-    <#assign strRuleCond="(">
+    <#assign strRuleCond="">
     <#if group.getPSDEFVRConditions()??>
         <#assign condOp=group.getCondOp()?replace("AND","&&")?replace("OR","||")>
         <#list group.getPSDEFVRConditions() as childRule>
@@ -95,7 +97,9 @@ public class ValueRuleValidator implements ConstraintValidator<ValueRuleCheck, D
             </#if>
         </#list>
     </#if>
-    <#assign strRuleCond=strRuleCond+")">
+    <#if strRuleCond!="">
+        <#assign strRuleCond="("+strRuleCond+")">
+    </#if>
     <#return strRuleCond/>
 </#function>