Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1809,6 +1809,7 @@ ${deaction.getRender().code}
     <#assign tempEntityName="et">
     <#if deaction.getPSDEActionLogics()??>
         <#list deaction.getPSDEActionLogics() as actionlogic>
+            <#if actionlogic.isValid()==true>
                 <#if deaction.getCodeName()?lower_case == "get">
                     <#assign tempEntityName="tempET">
                 </#if>
@@ -1817,6 +1818,7 @@ ${deaction.getRender().code}
         ${tempEntityName}.set("${keyfield.codeName?lower_case}",key);
                 </#if>
                 <#break>
+            </#if>
         </#list>
     </#if>
 </#macro>
@@ -1825,7 +1827,7 @@ ${deaction.getRender().code}
 <#macro addGetActionBoforeLogic deaction>
     <#if deaction.getPSDEActionLogics()??>
         <#list deaction.getPSDEActionLogics() as actionlogic>
-            <#if actionlogic.getAttachMode()=='BEFORE'>
+            <#if actionlogic.getAttachMode()=='BEFORE' && actionlogic.isValid()==true>
                 <#if actionlogic.isInternalLogic()>
         ${actionlogic.getPSDELogic().getCodeName()?lower_case}Logic.execute(tempET);
                 </#if>
@@ -1838,7 +1840,7 @@ ${deaction.getRender().code}
 <#macro addBoforeLogic deaction>
     <#if deaction.getPSDEActionLogics()??>
         <#list deaction.getPSDEActionLogics() as actionlogic>
-            <#if actionlogic.getAttachMode()=='BEFORE'>
+            <#if actionlogic.getAttachMode()=='BEFORE' && actionlogic.isValid()==true>
                 <#if actionlogic.isInternalLogic()>
         ${actionlogic.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
                 </#if>
@@ -1851,7 +1853,7 @@ ${deaction.getRender().code}
 <#macro addAfterLogic deaction>
     <#if deaction.getPSDEActionLogics()??>
         <#list deaction.getPSDEActionLogics() as actionlogic>
-            <#if actionlogic.getAttachMode()=='AFTER'>
+            <#if actionlogic.getAttachMode()=='AFTER' && actionlogic.isValid()==true>
                 <#if actionlogic.isInternalLogic()>
         ${actionlogic.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
                 </#if>