索引实体

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

@@ -4,13 +4,23 @@ TARGET=PSDATAENTITY
 <#comment>索引从实体</#comment>
 <#assign isIndexSubDE=false>
 <#if de.getMinorPSDERs()??>
-<#list de.getMinorPSDERs() as MinorPSDER>
+<#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()??>
                 <#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>
-</#list>
+        </#if>
+    </#list>
+</#if>
 <#if isIndexSubDE  && indexPSDER??>
 
 <#comment>索引主实体</#comment>

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

@@ -28,6 +28,8 @@ TARGET=PSDATAENTITY
 <#if de.getMinorPSDERs()??>
 <#list de.getMinorPSDERs() as MinorPSDER>
     <#if MinorPSDER.getDERType()?? && MinorPSDER.getDERType()=="DERINDEX">
+        <#comment>索引主实体是否建立分组属性</#comment>
+        <#if MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getMajorPSDataEntity().getIndexTypePSDEField()??>
             <#assign isIndexSubDE=true>
             <#assign indexPSDER=MinorPSDER>
             <#assign majorIndexDE=indexPSDER.getMajorPSDataEntity()>
@@ -35,6 +37,7 @@ TARGET=PSDATAENTITY
             <#assign majorIndexDECodeNameCamel = srfcaseformat(majorIndexDECodeName,'l_u2lC')?cap_first>
             <#break>
         </#if>
+    </#if>
 </#list>
 </#if>
 package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.service.impl;
@@ -624,15 +627,11 @@ ${deaction.getRender().code}
      * @param et
      */
     private void createIndexMajorEntityData(${de.codeName} et){
-        <#if majorIndexDE.getIndexTypePSDEField()??>
         if(ObjectUtils.isEmpty(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()))
             et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}((${srfjavatype(keyfield.stdDataType)})et.getDefaultKey(true));
         ${pub.getPKGCodeName()}.core.${majorIndexDE.getPSSystemModule().getCodeName()?lower_case}.domain.${majorIndexDECodeName} ${majorIndexDECodeName?lower_case} =${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et);
         ${majorIndexDECodeName?lower_case}.set("${majorIndexDE.getIndexTypePSDEField().codeName?lower_case}","${indexPSDER.getTypeValue()}");
         ${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.create(${majorIndexDECodeName?lower_case});
-        <#else>
-        throw new ${pub.getPKGCodeName()}.util.errors.BadRequestAlertException("实体[${de.getLogicName()}]未配置分组属性","${de.codeName}","createIndexMajorEntityData");
-        </#if>
     }
     </#if>