补充索引属性映射

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/mapping/%DE%InheritMapping.java.ftl

@@ -51,10 +51,8 @@ public interface ${de.codeName}InheritMapping {
         @Mapping(source ="${MinorIndexDEMajorTextFieldCodeName}",target = "${majorIndexDEMajorTextFieldCodeName}"),
         <#if indexPSDER.getPSDERIndexDEFieldMaps()??>
         <#list indexPSDER.getPSDERIndexDEFieldMaps() as indexFieldmapping>
-            <#assign majorDEField=indexFieldmapping.getMajorPSDEField()>
-            <#assign MinorDEField=indexFieldmapping.getMinorPSDEField()>
             <#comment>排除主键及主文本属性</#comment>
-            <#if majorDEField?? && MinorDEField?? && majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
+            <#if indexFieldmapping.getMajorPSDEField()?? && indexFieldmapping.getMinorPSDEField()?? && majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
         @Mapping(source ="${srfcaseformat(indexFieldmapping.getMinorPSDEField().codeName,'l_u2lC')}",target = "${srfcaseformat(indexFieldmapping.getMajorPSDEField().codeName,'l_u2lC')}"),
             </#if>
         </#list>
@@ -67,10 +65,8 @@ public interface ${de.codeName}InheritMapping {
         @Mapping(source ="${majorIndexDEMajorTextFieldCodeName}" ,target = "${MinorIndexDEMajorTextFieldCodeName}"),
         <#if indexPSDER.getPSDERIndexDEFieldMaps()??>
         <#list indexPSDER.getPSDERIndexDEFieldMaps() as indexFieldmapping>
-            <#assign majorDEField=indexFieldmapping.getMajorPSDEField()>
-            <#assign MinorDEField=indexFieldmapping.getMinorPSDEField()>
             <#comment>排除主键及主文本属性</#comment>
-            <#if majorDEField?? && MinorDEField?? && majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
+            <#if indexFieldmapping.getMajorPSDEField()?? && indexFieldmapping.getMinorPSDEField()??  && majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
         @Mapping(source ="${srfcaseformat(indexFieldmapping.getMajorPSDEField().codeName,'l_u2lC')}",target = "${srfcaseformat(indexFieldmapping.getMinorPSDEField().codeName,'l_u2lC')}"),
             </#if>
         </#list>