属性值规则测试 --- fix4

APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_zh_CN_base.ts.ftl

@@ -17,10 +17,10 @@ export default {
 <#if item.getPSDataEntity().getAllPSDEFValueRules?? && item.getPSDataEntity().getAllPSDEFValueRules()??>
 	derules:{
 <#list item.getPSDataEntity().getAllPSDEFValueRules() as deValueRule>
-<#if deValueRule?? && deValueRule.getPSDEFVRGroupCondition?? && deValueRule.getPSDEFVRGroupCondition()?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
+<#if deValueRule?? && (deValueRule.isDefaultMode() == false)  && deValueRule.getPSDEFVRGroupCondition?? && deValueRule.getPSDEFVRGroupCondition()?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
 <#assign deVRConditions = deValueRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() />
 <#list deVRConditions as singleCondition>
-		${deValueRule.getCodeName()?lower_case}${singleCondition.getCodeName()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
+		${deValueRule.getCodeName()?lower_case}${singleCondition.getModelName()?lower_case}:commonLogic.appcommonhandle("${singleCondition.getRuleInfo()}",null),
 </#list>
 </#if>
 </#list>