系统值规则正则式

@MACRO/LANG_FUN.ftl

@@ -34,15 +34,6 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                       type:"<#if condItem.getCondType?? && condItem.getCondType()??>${condItem.getCondType()}</#if>",
                       condOP:"<#if condItem.getCondOp?? && condItem.getCondOp()??>${condItem.getCondOp()}</#if>",
                       ruleInfo:"<#if condItem.getRuleInfo?? && condItem.getRuleInfo()??>${condItem.getRuleInfo()}</#if>", 
-                      <#if condItem.getPSSysValueRule?? && condItem.getPSSysValueRule()??>
-                      <#assign valRule = condItem.getPSSysValueRule()>
-                      sysRule:{
-                        ruleType:"<#if valRule.getRuleType?? && valRule.getRuleType()??>${valRule.getRuleType()}</#if>", 
-                        ruleInfo:"<#if valRule.getRuleInfo?? && valRule.getRuleInfo()??>${valRule.getRuleInfo()}</#if>",
-                        RegExCode:"<#if valRule.getRegExCode?? && valRule.getRegExCode()??>${valRule.getRegExCode()}</#if>",
-                      }
-                      </#if>
-                      
                       isKeyCond:<#if condItem.isKeyCond?? && condItem.isKeyCond()??>${condItem.isKeyCond()?c}</#if>,
                       <#if condItem.getParamValue?? && condItem.getParamValue()??>
                       paramValue:"${condItem.getParamValue()}",
@@ -71,6 +62,14 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
                       <#if condItem.isIncludeMinValue?? && condItem.isIncludeMinValue()??>
                       isIncludeMinValue:${condItem.isIncludeMinValue()?c},
                       </#if>
+                      <#if condItem.getPSSysValueRule?? && condItem.getPSSysValueRule()??>
+                      <#assign valRule = condItem.getPSSysValueRule()>
+                      sysRule:{
+                        ruleType:"<#if valRule.getRuleType?? && valRule.getRuleType()??>${valRule.getRuleType()}</#if>", 
+                        ruleInfo:"<#if valRule.getRuleInfo?? && valRule.getRuleInfo()??>${valRule.getRuleInfo()}</#if>",
+                        RegExCode:"<#if valRule.getRegExCode?? && valRule.getRegExCode()??>${valRule.getRegExCode()}</#if>",
+                      },
+                      </#if>
                       <#if condItem.getCondType?? && condItem.getCondType()?? && condItem.getCondType() == 'GROUP'>
                       group:[
                         <#if condItem.getPSDEFVRConditions?? && condItem.getPSDEFVRConditions()??>