联合主键

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

@@ -246,7 +246,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
         <#if hasMinorPSDERs gt 0>
         list.forEach(item->fillParentData(item));
         </#if>
-        saveBatch(list,batchSize);
+        <#comment>联合主键，走SaveOrUpdateBatch，防止因主键冲突导致后续数据无法保存</#comment>
+        <#if item.getUnionKeyValuePSDEFields()??>
+        this.saveOrUpdateBatch(list,batchSize);
+        <#else>
+        this.saveBatch(list,batchSize);
+        </#if>
     }
 
                     <#elseif deaction.getCodeName()?lower_case == "update">
@@ -456,12 +461,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
         if(_update.size()>0)
             this.updateBatch(_update);
         if(_create.size()>0)
-            <#comment>联合主键，走saveBatch，防止因主键冲突导致后续数据无法保存</#comment>
-            <#if item.getUnionKeyValuePSDEFields()??>
-            this.saveBatch(_create);
-            <#else>
             this.createBatch(_create);
-            </#if>
         if(delIds.size()>0)
             this.removeBatch(delIds);
 	}
@@ -764,7 +764,12 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
 
     @Override
     public void createBatch(List<${item.getCodeName()}> list) {
+        <#comment>联合主键，走SaveOrUpdateBatch，防止因主键冲突导致后续数据无法保存</#comment>
+        <#if item.getUnionKeyValuePSDEFields()??>
+        repository.saveAll(list);
+        <#else>
         repository.insert(list);
+        </#if>
     }
 
                     <#elseif deaction.getCodeName()?lower_case == "update">