补充属性值规则

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/dto/%ITEM%DTO.java.ftl

@@ -124,30 +124,26 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable
 <#if defield !=''>
     <#if defield.getAllPSDEFValueRules()??>
         <#list defield.getAllPSDEFValueRules() as defieldVR>
-            <#if defieldVR.getPSDEFVRGroupCondition?? && defieldVR.getPSDEFVRGroupCondition()??>
-                <#list defieldVR.getPSDEFVRGroupCondition() as defieldVRCond>
-                    <#if defieldVRCond.getCondType()=='SIMPLE'>
-                    <#comment>属性默认值规则</#comment>
-                    <#elseif defieldVRCond.getCondType()=='GROUP' && defieldVR.getCodeName()=='Default'>
-                        <#if defieldVRCond.getPSDEFVRConditions?? && defieldVRCond.getPSDEFVRConditions()??>
-                            <#list defieldVRCond.getPSDEFVRConditions() as subVRCond>
-                                <#if subVRCond.getCondType()=='STRINGLENGTH'>
-                                    <#if subVRCond.getMaxValue()?c!='-1'>
+            <#if defieldVR.getPSDEFVRGroupCondition?? && defieldVR.getPSDEFVRGroupCondition()?? && defieldVR.getCodeName()=='Default'>
+                <#assign vrCond=defieldVR.getPSDEFVRGroupCondition()>
+                <#assign vrCondType=vrCond.getCondType()>
+                <#assign vrCondOp=vrCond.getCondOp()>
+                <#if vrCond.getPSDEFVRConditions?? && vrCond.getPSDEFVRConditions()??>
+                    <#list vrCond.getPSDEFVRConditions() as subVRCond>
+                        <#if subVRCond.getCondType()=='STRINGLENGTH'>
+                            <#if subVRCond.getMaxValue()?c!='-1'>
     @Size(min = 0, max = ${subVRCond.getMaxValue()?c}, message = "${subVRCond.getRuleInfo()}")
-                                    </#if>
-                                <#elseif subVRCond.getCondType()=='ISNOTNULL'>
-                                    <#assign notNullMsg="["+defield.getLogicName()+"]不允许为空!">
-                                    <#if srfr7javatype(defield.stdDataType)=='String'>
+                            </#if>
+                        <#elseif subVRCond.getCondType()=='ISNOTNULL'>
+                            <#assign notNullMsg="["+defield.getLogicName()+"]不允许为空!">
+                            <#if srfr7javatype(defield.stdDataType)=='String'>
     @NotBlank(message = "${notNullMsg}")
-                                    <#else>
+                            <#else>
     @NotNull(message = "${notNullMsg}")
-                                    </#if>
-                                </#if>
-                            </#list>
+                            </#if>
                         </#if>
-                    <#else>
-                    </#if>
-                </#list>
+                    </#list>
+                </#if>
             </#if>
         </#list>
     </#if>