Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7sfstdtempl/ibiz4jr7 into dev

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/I%DE%Service.java.ftl

@@ -125,6 +125,7 @@ public interface I${item.codeName}Service {
     boolean ${srfmethodname(deaction.getCodeName())}Batch(List<${item.codeName}> etList);
                 <#elseif deaction.getActionType()=='DELOGIC'>
     ${item.codeName} ${srfmethodname(deaction.getCodeName())}(${item.codeName} et);
+    boolean ${srfmethodname(deaction.getCodeName())}Batch(List<${item.codeName}> etList);
                 <#elseif deaction.codeName?lower_case == 'get'>
     ${item.codeName} get(${srfr7javatype(keyfield.stdDataType)} key);
                 <#elseif deaction.codeName?lower_case == "create">

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

@@ -243,6 +243,9 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
          return et ;
     }
 
+    <#comment>实体逻辑批处理</#comment>
+    <@customBatchAction deaction/>
+
                     <#elseif deaction.getCodeName()?lower_case == 'get'>
     @Override
     <@transactionalAnno deaction/>
@@ -364,8 +367,8 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
             getProxyService().saveOrUpdate(et);
             <#else>
             getProxyService().save(et);
-        }
             </#if>
+        }
         <#else>
             <#comment>联合主键，走SaveOrUpdateBatch，防止因主键冲突导致后续数据无法保存</#comment>
             <#if item.getUnionKeyValuePSDEFields()??>
@@ -1178,6 +1181,9 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
          return et ;
     }
 
+    <#comment>实体逻辑批处理</#comment>
+    <@customBatchAction deaction/>
+
                     <#elseif deaction.getCodeName()?lower_case == 'get'>
     @Override
     <@transactionalAnno deaction/>
@@ -1683,6 +1689,9 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
          return et ;
     }
 
+    <#comment>实体逻辑批处理</#comment>
+    <@customBatchAction deaction/>
+
                     <#elseif deaction.getCodeName()?lower_case == 'get'>
                         <#assign getMethodParam = keyfield.getCodeName()?lower_case>
     @Override
@@ -2250,6 +2259,9 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
          return et ;
     }
 
+    <#comment>实体逻辑批处理</#comment>
+    <@customBatchAction deaction/>
+
                     <#elseif deaction.getCodeName()?lower_case == 'get'>
     @Override
     public ${item.getCodeName()} get(${srfr7javatype(keyfield.stdDataType)} key) {

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl

@@ -279,7 +279,7 @@ public class ${itemCodeName}Resource {
     </#if>
     }
     <#comment>自定义行为批处理</#comment>
-     <#if (deaction.getActionType()=='USERCUSTOM')>
+     <#if (deaction.getActionType()=='USERCUSTOM' || deaction.getActionType()=='DELOGIC')>
          <@customBatchAction deaction/>
     </#if>
 
@@ -645,7 +645,7 @@ public class ${itemCodeName}Resource {
     </#if>
     }
     <#comment>自定义行为批处理</#comment>
-     <#if (deaction.getActionType()=='USERCUSTOM')>
+     <#if (deaction.getActionType()=='USERCUSTOM' || deaction.getActionType()=='DELOGIC')>
          <@customBatchActionRS deaction/>
     </#if>
                </#if>

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/aspect/DELogicAspect.java.ftl

@@ -1026,8 +1026,8 @@ public class DELogicAspect {
                 for (Object item : instances) {
                     JSONObject dynaInst = (JSONObject) item;
                     if (dynaInst != null) {
-                        if (!ObjectUtils.isEmpty(dynaInst.get("instTag"))) {
-                            return String.valueOf(dynaInst.get("instTag"));
+                        if (!ObjectUtils.isEmpty(dynaInst.get("instTag")) && instTag.equals(dynaInst.get("instTag"))) {
+                            return String.valueOf(dynaInst.get("id"));
                         }
                     }
                 }

SLN/globalfunc.cfg

@@ -3,8 +3,11 @@
 <#assign result = codeName>
 <#if result!=''>
     <#if ((pub.getPSSFStyleParam().getStyleParam("camelCase",""))!'') == "true">
-        <#assign result = srfcaseformat(result,'UC2l_u')>
-        <#assign result = srfcaseformat(result,'l_u2lC')>
+        <#if result?matches("^[A-Z_]{3}\\w*")>
+            <#assign result = result?lower_case>
+        </#if>
+            <#assign result = srfcaseformat(result,'UC2l_u')>
+            <#assign result = srfcaseformat(result,'l_u2lC')>
     <#else>
         <#assign result = srfcaseformat(result,'l_u2lC')>
     </#if>