继承关系

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

@@ -4,18 +4,15 @@ TARGET=PSDATAENTITY
 <#comment>索引从实体</#comment>
 <#assign isIndexSubDE=false>
 <#if de.getMinorPSDERs()??>
-<#comment>判断当前实体是否为索引子实体</#comment>
+<#comment>判断当前实体是否为索引子实体或继承子实体</#comment>
 <#assign isIndexSubDE=false>
 <#if de.getMinorPSDERs()??>
     <#list de.getMinorPSDERs() as MinorPSDER>
-        <#if MinorPSDER.getDERType()?? && MinorPSDER.getDERType()=="DERINDEX">
-            <#comment>索引主实体是否建立分组属性</#comment>
-            <#if MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getMajorPSDataEntity().getIndexTypePSDEField()??>
+        <#if MinorPSDER.getDERType()?? && MinorPSDER.getMajorPSDataEntity()??>
+            <#comment>继承关系、索引关系 (包含分组属性)</#comment>
+            <#if MinorPSDER.getDERType()=="DERINHERIT" || (MinorPSDER.getDERType()=="DERINDEX" ) && MinorPSDER.getMajorPSDataEntity().getIndexTypePSDEField()??>
                 <#assign isIndexSubDE=true>
                 <#assign indexPSDER=MinorPSDER>
-                <#assign majorIndexDE=indexPSDER.getMajorPSDataEntity()>
-                <#assign majorIndexDECodeName=indexPSDER.getMajorPSDataEntity().codeName>
-                <#assign majorIndexDECodeNameCamel = srfcaseformat(majorIndexDECodeName,'l_u2lC')?cap_first>
                 <#break>
             </#if>
         </#if>
@@ -48,7 +45,7 @@ public interface ${de.codeName}InheritMapping {
         @Mapping(source ="${MinorIndexDEKeyFieldCodeName}",target = "${majorIndexDEKeyFieldCodeName}"),
         @Mapping(source ="${MinorIndexDEMajorTextFieldCodeName}",target = "${majorIndexDEMajorTextFieldCodeName}"),
         @Mapping(target ="focusNull",ignore = true),
-        <#if indexPSDER.getPSDERIndexDEFieldMaps()??>
+        <#if indexPSDER.getPSDERIndexDEFieldMaps?? && indexPSDER.getPSDERIndexDEFieldMaps()??>
         <#list indexPSDER.getPSDERIndexDEFieldMaps() as indexFieldmapping>
             <#comment>排除主键及主文本属性</#comment>
             <#if indexFieldmapping.getMajorPSDEField()?? && indexFieldmapping.getMinorPSDEField()??>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -27,9 +27,9 @@ TARGET=PSDATAENTITY
 <#assign isIndexSubDE=false>
 <#if de.getMinorPSDERs()??>
 <#list de.getMinorPSDERs() as MinorPSDER>
-    <#if MinorPSDER.getDERType()?? && MinorPSDER.getDERType()=="DERINDEX">
-        <#comment>索引主实体是否建立分组属性</#comment>
-        <#if MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getMajorPSDataEntity().getIndexTypePSDEField()??>
+    <#if MinorPSDER.getDERType()?? && MinorPSDER.getMajorPSDataEntity()??>
+        <#comment>继承关系、索引关系 (包含分组属性)</#comment>
+        <#if MinorPSDER.getDERType()=="DERINHERIT" || (MinorPSDER.getDERType()=="DERINDEX" ) && MinorPSDER.getMajorPSDataEntity().getIndexTypePSDEField()??>
             <#assign isIndexSubDE=true>
             <#assign indexPSDER=MinorPSDER>
             <#assign majorIndexDE=indexPSDER.getMajorPSDataEntity()>