补充索引属性映射

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

@@ -52,8 +52,14 @@ public interface ${de.codeName}InheritMapping {
         <#if indexPSDER.getPSDERIndexDEFieldMaps()??>
         <#list indexPSDER.getPSDERIndexDEFieldMaps() as indexFieldmapping>
             <#comment>排除主键及主文本属性</#comment>
-            <#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 indexFieldmapping.getMajorPSDEField()?? && indexFieldmapping.getMinorPSDEField()??>
+                <#assign majorDEField=indexFieldmapping.getMajorPSDEField()>
+                <#assign MinorDEField=indexFieldmapping.getMinorPSDEField()>
+                <#if majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
+                    <#if !P.exists(MinorDEField.codeName,majorDEField.codeName)>
+        @Mapping(source ="${srfcaseformat(MinorDEField.codeName,'l_u2lC')}",target = "${srfcaseformat(majorDEField.codeName,'l_u2lC')}"),
+                    </#if>
+                </#if>
             </#if>
         </#list>
         </#if>
@@ -66,8 +72,14 @@ public interface ${de.codeName}InheritMapping {
         <#if indexPSDER.getPSDERIndexDEFieldMaps()??>
         <#list indexPSDER.getPSDERIndexDEFieldMaps() as indexFieldmapping>
             <#comment>排除主键及主文本属性</#comment>
-            <#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 indexFieldmapping.getMajorPSDEField()?? && indexFieldmapping.getMinorPSDEField()??>
+                <#assign majorDEField=indexFieldmapping.getMajorPSDEField()>
+                <#assign MinorDEField=indexFieldmapping.getMinorPSDEField()>
+                <#if majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
+                    <#if !P.exists(majorDEField.codeName,MinorDEField.codeName)>
+        @Mapping(source ="${srfcaseformat(majorDEField.codeName,'l_u2lC')}",target = "${srfcaseformat(MinorDEField.codeName,'l_u2lC')}"),
+                    </#if>
+                </#if>
             </#if>
         </#list>
         </#if>