恢复

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

@@ -451,21 +451,21 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
             ${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')>-->
+                    <#--<#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 >
+                et.set${minorFieldCodeName}(${MajorEntityName}.get${majorFieldCodeName}());
+                        </#if>
+                    </#list>
             }
         }
                 </#if>