附加行为补充异常处理

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

@@ -2307,7 +2307,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                 <#if actionlogic.isInternalLogic() && actionlogic.getPSDELogic().isEnableBackend()>
         ${actionlogic.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
                 <#elseif (actionlogic.getDstPSDE()!'')!='' && (actionlogic.getDstPSDEAction()!'')!=''>
-        <@addActionLogic actionlogic/>
+        <@addActionLogic deaction actionlogic/>
                 </#if>
             </#if>
         </#list>
@@ -2315,12 +2315,17 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
 </#macro>
 
 <#comment>附加实体行为</#comment>
-<#macro addActionLogic actionlogic>
+<#macro addActionLogic deaction actionlogic>
     <#assign actionLogicDE=actionlogic.getDstPSDE()>
     <#assign actionLogicDEAction=actionlogic.getDstPSDEAction()>
-    <#assign logicActionType=actionLogicDEAction.getActionType()>
-    <#assign logicCodeName=actionLogicDEAction.getCodeName()?lower_case>
-    <#if  (logicActionType=='USERCUSTOM')|| logicActionType=='DELOGIC'|| logicCodeName == "create" || logicCodeName == "update" || logicCodeName == "save" || logicCodeName == "getdraft" || logicCodeName == "checkkey">
+    <#assign sourceActionType=deaction.getActionType()>
+    <#assign sourceCodeName=deaction.getCodeName()?lower_case>
+    <#assign targetActionType=actionLogicDEAction.getActionType()>
+    <#assign targetCodeName=actionLogicDEAction.getCodeName()?lower_case>
+    <#if  ((sourceActionType=='USERCUSTOM')|| sourceActionType=='DELOGIC'|| sourceCodeName == "create" || sourceCodeName == "update" ||
+    sourceCodeName == "save" || sourceCodeName == "getdraft" || sourceCodeName == "checkkey")  &&
+    ((targetActionType=='USERCUSTOM')|| targetActionType=='DELOGIC'|| targetCodeName == "create" || targetCodeName == "update" ||
+        targetCodeName == "save" || targetCodeName == "getdraft" || targetCodeName == "checkkey")>
         <#if actionlogic.isIgnoreException()?? && actionlogic.isIgnoreException()==true>
         try{
             <@actionLogic_entity actionlogic/>
@@ -2331,7 +2336,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
         <#else>
             <@actionLogic_entity actionlogic/>
         </#if>
-    <#elseif logicCodeName == "remove">
+    <#elseif sourceCodeName=='remove' && targetCodeName == "remove">
         <#if actionlogic.isIgnoreException()?? && actionlogic.isIgnoreException()==true>
         try{
         <@actionLogic_remove actionlogic/>
@@ -2357,7 +2362,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
 <#comment>实体行为附加逻辑-remove</#comment>
 <#macro actionLogic_remove actionlogic>
     <#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()>
-       ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(key);
+        ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(key);
     </#if>
 </#macro>
 
@@ -2369,7 +2374,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
                 <#if actionlogic.isInternalLogic() && actionlogic.getPSDELogic().isEnableBackend()>
         ${actionlogic.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
                 <#elseif (actionlogic.getDstPSDE()!'')!='' && (actionlogic.getDstPSDEAction()!'')!=''>
-        <@addActionLogic actionlogic/>
+        <@addActionLogic deaction actionlogic/>
                 </#if>
             </#if>
         </#list>