实体服务调整

APP/src/app-core/service/%DE_PKGPATH%/%DE_PKGPATH%-service-base.ts.ftl

@@ -84,6 +84,8 @@ import { ${srfclassname('${singleLogic.getCodeName()}')}Logic } from './${srffil
         } 
         return {status:200,data:res};
 </#if>
+<#else>
+        <@service_block item=item singleAppMethod=singleAppMethod />
 </#if>
 <#-- 预定义类型为索引实体end -->
 </#if>
@@ -104,6 +106,7 @@ import { ${srfclassname('${singleLogic.getCodeName()}')}Logic } from './${srffil
 <#-- 定义service_block start -->
 <#macro service_block item singleAppMethod afterActionStr = "">
  <#if item.getPSAppDERSPathCount() gt 0 && singleServiceApi??>
+    <#assign singleServiceApi = singleAppMethod.getPSDEServiceAPIMethod()/>
     <#list 1..item.getPSAppDERSPathCount() as count>
         <#assign path = ''/>
         <#assign condition = ''/>
@@ -215,7 +218,8 @@ import { ${srfclassname('${singleLogic.getCodeName()}')}Logic } from './${srffil
         </#if>
     </#list>
     </#if>
-    <#if item.isMajor()>
+    <#if item.isMajor() && singleAppMethod.getPSDEServiceAPIMethod?? &&  singleAppMethod.getPSDEServiceAPIMethod()??>
+        <#assign singleServiceApi = singleAppMethod.getPSDEServiceAPIMethod()/>
         <#-- 方法类型为SELECT -->
         <#if singleAppMethod.getMethodType() == "SELECT">
         <#--  if(context.${item.getCodeName()?lower_case}){  -->
@@ -328,7 +332,7 @@ import { ${srfclassname('${singleLogic.getCodeName()}')}Logic } from './${srffil
         </#if>
     </#if>
     <#-- 嵌套成员 -->
-    <#if item.isMajor() == false && !singleServiceApi??>
+    <#if item.isMajor() == false && !(singleAppMethod.getPSDEServiceAPIMethod?? &&  singleAppMethod.getPSDEServiceAPIMethod()??)>
      <#if singleAppMethod.getMethodType() == "SELECT">
         // ${singleAppMethod.getCodeName()} ---SELECT
         <#-- 方法类型为FETCH -->
@@ -575,9 +579,6 @@ export class ${srfclassname('${item.getCodeName()}')}ServiceBase extends EntityS
 <#-- 实体接口调用start -->
 <#if item.getAllPSAppDEMethods?? && item.getAllPSAppDEMethods()??>
 <#list item.getAllPSAppDEMethods() as singleAppMethod>
-<#if singleAppMethod.getPSDEServiceAPIMethod?? &&  singleAppMethod.getPSDEServiceAPIMethod()??>
-<#assign singleServiceApi = singleAppMethod.getPSDEServiceAPIMethod()/>
-</#if>
     <#if singleAppMethod.render??>
         ${singleAppMethod.render.code}
     <#else>
@@ -629,11 +630,7 @@ export class ${srfclassname('${item.getCodeName()}')}ServiceBase extends EntityS
     <#-- 无实体行为，有接口走接口，无接口走本地供数 start -->
     <#-- @author zpc -->
     <#-- @update 2020.7.22 17:00 -->
-    <#if singleAppMethod.getPSDEServiceAPIMethod?? &&  singleAppMethod.getPSDEServiceAPIMethod()??>
-    <@service_block item=item singleAppMethod=singleAppMethod />
-    <#else>
     <@local_supply item=item singleAppMethod=singleAppMethod />
-    </#if>
     <#-- 无实体行为，有接口走接口，无接口走本地供数 end -->
     </#if>
     }