Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7 into dev

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

@@ -534,25 +534,9 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
         <#list appdeAction.getAfterPSDEActionLogics() as afterlogic>
         <#if afterlogic.getPSDELogic()?? && afterlogic.getPSDELogic().getLogicHolder?? && afterlogic.getPSDELogic().getLogicHolder()?? && (afterlogic.getPSDELogic().getLogicHolder() == 2 || afterlogic.getPSDELogic().getLogicHolder() == 3)>
         <#assign singleLogic = afterlogic.getPSDELogic() />
-        <#if afterlogic.isInternalLogic()>
-        <#-- 内部逻辑start -->
     <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(res)).data});</@compress>
             <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}Data:any = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res.data,isloading?true:false);</@compress>
             res ={status:200,data:${singleLogic.getCodeName()?lower_case}Data};
-        <#-- 内部逻辑end -->
-        <#else>
-        <#-- 外部逻辑start -->
-        <#if afterlogic.isIgnoreException()>try {</#if>
-            let tempRes:any = <#if afterlogic.isCloneParam()>JSON.parse(JSON.stringify(res))<#else>{}</#if>;
-        <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:tempRes.data});</@compress>
-            <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}Data:any = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,tempRes.data,isloading?true:false);</@compress>
-            res ={status:200,data:${singleLogic.getCodeName()?lower_case}Data};
-        <#if afterlogic.isIgnoreException()>} catch (error) {
-            console.log("执行逻辑发生异常");
-        }
-        </#if>
-        <#-- 外部逻辑end -->
-        </#if>
         </#if>
         </#list>
     </#if>