调整DER1N关系注入

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

@@ -67,22 +67,29 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
         <#list de.getMajorPSDERs() as der>
             <#if der.getDERType() =='DER1N' && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2||der.getMinorPSDataEntity().getStorageMode()==4)>
                 <#if !P.exists('DER1N',der.getMinorPSDataEntity().getCodeName())>
+                    <#if der.getMinorPSDataEntity().getCodeName()==de.codeName>
+    private ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service=this;
+                    <#else>
     @Autowired
     @Lazy
     private ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service;
+                    </#if>
                 </#if>
             </#if>
         </#list>
     </#if>
-
     <#comment>引入关联依赖-主关系</#comment>
     <#if de.getMinorPSDERs()??>
         <#list de.getMinorPSDERs() as der>
             <#if der.getDERType() =='DER1N' && (der.getMajorPSDataEntity().getStorageMode()==1||der.getMajorPSDataEntity().getStorageMode()==2||der.getMajorPSDataEntity().getStorageMode()==4)>
                 <#if !P.exists('DER1N',der.getMajorPSDataEntity().getCodeName())>
+                    <#if der.getMinorPSDataEntity().getCodeName()==de.codeName>
+    private ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service=this;
+                    <#else>
     @Autowired
     @Lazy
     private ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service;
+                    </#if>
                 </#if>
             </#if>
         </#list>
@@ -333,6 +340,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
                     <#elseif deaction.getCodeName()?lower_case == "getdraft">
     @Override
     public ${item.getCodeName()} getDraft(${item.getCodeName()} et) {
+        fillParentData(et);
         return et;
     }