恢复

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

@@ -433,46 +433,46 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
     }
     </#if>
 
-    <#--<#comment>为当前实体填充父数据（外键值文本、外键值附加数据）</#comment>-->
-    <#--<#if item.getMinorPSDERs?? && item.getMinorPSDERs()??>-->
-    <#--/**-->
-     <#--* 为当前实体填充父数据（外键值文本、外键值附加数据）-->
-     <#--* @param et-->
-     <#--*/-->
-    <#--private void fillParentData(${item.getCodeName()} et){-->
-        <#--<#list item.getMinorPSDERs() as MinorPSDER>-->
-            <#--<#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N'>-->
-                <#--<#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>-->
-                    <#--<#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()>-->
-                    <#--<#assign MajorEntityName=srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')>-->
-                    <#--<#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first>-->
-        <#--//实体关系[${MinorPSDER.getLogicName()}]-->
-        <#--if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){-->
-            <#--${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=et.get${MajorEntityName?cap_first}();-->
-            <#--if(!ObjectUtils.isEmpty(${MajorEntityName})){-->
-                <#--<#comment>找出当前关系的外键值文本及附加数据字段</#comment>-->
-                    <#--<#list de.getPSDEFieldsByDER(MinorPSDER.name) as defield >-->
-                        <#--<#if (((defield.getDataType())!'')!='PICKUP')>-->
+    <#comment>为当前实体填充父数据（外键值文本、外键值附加数据）</#comment>
+    <#if item.getMinorPSDERs?? && item.getMinorPSDERs()??>
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(${item.getCodeName()} et){
+        <#list item.getMinorPSDERs() as MinorPSDER>
+            <#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N'>
+                <#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
+                    <#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()>
+                    <#assign MajorEntityName=srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')>
+                    <#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first>
+        //实体关系[${MinorPSDER.getLogicName()}]
+        if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){
+            ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=et.get${MajorEntityName?cap_first}();
+            if(!ObjectUtils.isEmpty(${MajorEntityName})){
+                <#comment>找出当前关系的外键值文本及附加数据字段</#comment>
+                    <#list de.getPSDEFieldsByDER(MinorPSDER.name) as defield >
+                        <#if (((defield.getDataType())!'')!='PICKUP')>
+                            <#assign minorFieldCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC')?cap_first >
+                            <#assign majorFieldCodeName = srfcaseformat(defield.getRelatedPSDEField().getCodeName(),'l_u2lC')?cap_first >
+                //test
+                et.set${minorFieldCodeName}(${MajorEntityName}.get${majorFieldCodeName}());
+                        </#if>
+                    </#list>
+                    <#--<#list de.getAllPSDEFields() as defield>-->
+                        <#--<#if defield.getPSDER1N?? && defield.getPSDER1N()?? && defield.getPSDER1N().name==MinorPSDER.name && (((defield.getDataType())!'')!='PICKUP')>-->
                             <#--<#assign minorFieldCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC')?cap_first >-->
                             <#--<#assign majorFieldCodeName = srfcaseformat(defield.getRelatedPSDEField().getCodeName(),'l_u2lC')?cap_first >-->
-                <#--//test-->
                 <#--et.set${minorFieldCodeName}(${MajorEntityName}.get${majorFieldCodeName}());-->
                         <#--</#if>-->
                     <#--</#list>-->
-                    <#--&lt;#&ndash;<#list de.getAllPSDEFields() as defield>&ndash;&gt;-->
-                        <#--&lt;#&ndash;<#if defield.getPSDER1N?? && defield.getPSDER1N()?? && defield.getPSDER1N().name==MinorPSDER.name && (((defield.getDataType())!'')!='PICKUP')>&ndash;&gt;-->
-                            <#--&lt;#&ndash;<#assign minorFieldCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC')?cap_first >&ndash;&gt;-->
-                            <#--&lt;#&ndash;<#assign majorFieldCodeName = srfcaseformat(defield.getRelatedPSDEField().getCodeName(),'l_u2lC')?cap_first >&ndash;&gt;-->
-                <#--&lt;#&ndash;et.set${minorFieldCodeName}(${MajorEntityName}.get${majorFieldCodeName}());&ndash;&gt;-->
-                        <#--&lt;#&ndash;</#if>&ndash;&gt;-->
-                    <#--&lt;#&ndash;</#list>&ndash;&gt;-->
-            <#--}-->
-        <#--}-->
-                <#--</#if>-->
-            <#--</#if>-->
-        <#--</#list>-->
-    <#--}-->
-    <#--</#if>-->
+            }
+        }
+                </#if>
+            </#if>
+        </#list>
+    }
+    </#if>
 
     <#comment>输出自定义sql查询</#comment>
     @Override