实体关系属性映射

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

@@ -26,7 +26,7 @@ TARGET=PSDATAENTITY
 <#assign hasPSDERsMapping=false>
 <#if item.getMinorPSDERs?? && item.getMinorPSDERs()??>
     <#list item.getMinorPSDERs() as MinorPSDER>
-        <#if MinorPSDER.getPSDER1NDEFieldMaps()?? && MinorPSDER.getDERType() =='DER1N'  && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4) >
+        <#if MinorPSDER.getPSDER1NDEFieldMaps?? && MinorPSDER.getPSDER1NDEFieldMaps()?? && MinorPSDER.getDERType() =='DER1N'  && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4) >
             <#list MinorPSDER.getPSDER1NDEFieldMaps() as derField>
                 <#if derField.getMapType()=="COUNT" || derField.getMapType()=="SUM"|| derField.getMapType()=="AVG" || derField.getMapType()=="MAX" || derField.getMapType()=="MIN">
                     <#assign hasPSDERsMapping=true>
@@ -654,7 +654,7 @@ ${deaction.getRender().code}
                     <#assign MajorEntityService=srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')+"Service">
         //实体关系[${MinorPSDER.name}]
         if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){
-            <#if MinorPSDER.getPSDER1NDEFieldMaps()??>
+            <#if MinorPSDER.getPSDER1NDEFieldMaps?? && MinorPSDER.getPSDER1NDEFieldMaps()??>
                 ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=new ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()}();
                 <#list MinorPSDER.getPSDER1NDEFieldMaps() as derField>
                     <#if  derField.getMapType()=="COUNT" || derField.getMapType()=="SUM"|| derField.getMapType()=="AVG" || derField.getMapType()=="MAX" || derField.getMapType()=="MIN">