主实体删除操作（同时删除、置空、限制删除）

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

@@ -177,10 +177,15 @@ public interface I${item.codeName}Service{
 								<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
 								<#if deDefaultDataSet.getPSDEDataQueries()??>
     List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) ;
+    <#--List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) ;-->
     <#if item.isEnableEntityCache()==true>
     @CacheEvict(value="${item.codeName?lower_case}",allEntries=true)
     </#if>
     void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) ;
+    <#if item.isEnableEntityCache()==true>
+    @CacheEvict(value="${item.codeName?lower_case}",allEntries=true)
+    </#if>
+    void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) ;
 	                                <#assign nested=MinorPSDER.isNestedRS()>
                                     <#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
                                         <#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api>

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

@@ -599,6 +599,11 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
         this.remove(new QueryWrapper<${item.getCodeName()}>().eq("${MajorField.getName()?lower_case}",${MajorkeyField.codeName?lower_case}));
     }
 
+    @Override
+    public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
+        this.remove(new QueryWrapper<${item.getCodeName()}>().in("${MajorField.getName()?lower_case}",ids));
+    }
+
 	                                <#assign nested=MinorPSDER.isNestedRS()>
                                     <#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
                                         <#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api>
@@ -1343,6 +1348,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
             this.removeBatch(delIds);
     }
 
+    @Override
+    public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
+        //暂未支持
+    }
+
 	                                <#assign nested=MinorPSDER.isNestedRS()>
                                     <#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
                                         <#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api>
@@ -1878,6 +1888,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
             this.removeBatch(delIds);
     }
 
+    @Override
+    public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
+        //暂未支持
+    }
+
 	                                <#assign nested=MinorPSDER.isNestedRS()>
                                     <#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
                                         <#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api>
@@ -2196,6 +2211,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
             this.removeBatch(delIds);
     }
 
+    @Override
+    public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
+        //暂未支持
+    }
+
 	                                <#assign nested=MinorPSDER.isNestedRS()>
                                     <#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
                                         <#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api>

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

@@ -73,7 +73,10 @@ public class ESAspect
                 return;
             }
             Object arg=args[0];
-            if(arg instanceof EntityBase  || arg instanceof List){
+            if ("remove".equals(action) || "removeBatch".equals(action)){
+                executeESMethod(exService,action,arg);
+            }
+            else if(arg instanceof EntityBase  || arg instanceof List){
                 EvaluationContext exMappingCtx = new StandardEvaluationContext();
                 exMappingCtx.setVariable("service",service);
                 Expression esMappingExp = parser.parseExpression("#service.getESMapping()");
@@ -89,9 +92,6 @@ public class ESAspect
                 arg=esDomainExp.getValue(exDomainCtx);
                 executeESMethod(exService,action,arg);
             }
-            else if ("remove".equals(action) || "removeBatch".equals(action)){
-                executeESMethod(exService,action,arg);
-            }
         } catch (Exception e) {
             log.error("同步[{}]实体全文检索数据失败，{}",deName,e);
         }