实体行为执行前、后逻辑增加行为逻辑者判断

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

@@ -486,7 +486,7 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
 <#macro excuteBeforeAction appdeAction>
     <#if appdeAction.getBeforePSDEActionLogics?? && appdeAction.getBeforePSDEActionLogics()??>
         <#list appdeAction.getBeforePSDEActionLogics() as beforelogic>
-        <#if beforelogic.getPSDELogic()??>
+        <#if beforelogic.getPSDELogic()?? && beforelogic.getPSDELogic().getLogicHolder?? && beforelogic.getPSDELogic().getLogicHolder()?? && (beforelogic.getPSDELogic().getLogicHolder() == 2 || beforelogic.getPSDELogic().getLogicHolder() == 3)>
         <#assign singleLogic = beforelogic.getPSDELogic() />
         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(data))});
         data = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,data,isloading?true:false);
@@ -502,10 +502,10 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
 <#macro excuteAfterAction appdeAction>
     <#if appdeAction.getAfterPSDEActionLogics?? && appdeAction.getAfterPSDEActionLogics()??>
         <#list appdeAction.getAfterPSDEActionLogics() as afterlogic>
-        <#if afterlogic.getPSDELogic()??>
+        <#if afterlogic.getPSDELogic()?? && afterlogic.getPSDELogic().getLogicHolder?? && afterlogic.getPSDELogic().getLogicHolder()?? && (afterlogic.getPSDELogic().getLogicHolder() == 2 || afterlogic.getPSDELogic().getLogicHolder() == 3)>
         <#assign singleLogic = afterlogic.getPSDELogic() />
     <@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))});</@compress>
-            <@compress single_line=true>res = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res,isloading?true:false);</@compress>
+            <@compress single_line=true>res = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res.data,isloading?true:false);</@compress>
         </#if>
         </#list>
     </#if>