From 8bda10c23c7a7d772669e610e56e80de099b0747 Mon Sep 17 00:00:00 2001
From: CharlieJohn <8595764@qq.com>
Date: Thu, 17 Jun 2021 09:30:52 +0800
Subject: [PATCH] =?UTF-8?q?!54=20fix=20=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=20service=20=E5=92=8C=20serviceImpl?=
 =?UTF-8?q?=20=E4=B8=AD=20deleteWithValidByIds=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF=20*=20fi?=
 =?UTF-8?q?x=20=E7=94=9F=E6=88=90=E5=99=A8=E7=94=9F=E6=88=90=E7=9A=84=20se?=
 =?UTF-8?q?rvice=20=E5=92=8C=20serviceImpl=20=E4=B8=AD=20deleteWithValidBy?=
 =?UTF-8?q?Ids=20=E5=8F=82=E6=95=B0=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-framework/pom.xml                                     | 6 ++++++
 ruoyi-generator/src/main/resources/vm/java/service.java.vm  | 2 +-
 .../src/main/resources/vm/java/serviceImpl.java.vm          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 4313ce55..236eb056 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -67,6 +67,12 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
+        <!-- jdk11 缺失依赖 jaxb-->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index d5016d43..67e6baf8 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -58,5 +58,5 @@ public interface I${ClassName}Service extends IServicePlus<${ClassName}> {
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index c727ce6e..9802b299 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -101,7 +101,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }