From 1befd0dfb9216dc3f17a63461f584a6922a2172d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 13 Oct 2021 18:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E4=B8=8D=E6=98=AF=E6=A0=91=E8=A1=A8?=
 =?UTF-8?q?=E9=83=BD=E7=94=9F=E6=88=90findPage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/modules/gen/crud/service.xml  | 7 -------
 .../resources/templates/modules/gen/crud_cloud/service.xml | 7 -------
 .../main/resources/templates/modules/gen/query/service.xml | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
index 54305447..59bb714a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
@@ -10,18 +10,14 @@
  */
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
 
-<% if (table.isTreeEntity){ %>
 import java.util.List;
-<% } %>
 <% if (table.childList.~size > 0){ %>
 import org.springframework.beans.factory.annotation.Autowired;
 <% } %>
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-<% if (!table.isTreeEntity){ %>
 import com.jeesite.common.entity.Page;
-<% } %>
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service;
 import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
 import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
@@ -75,7 +71,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 		return super.get(${className});
 		<% } %>
 	}
-	<% if(!table.isTreeEntity){ %>
 	
 	/**
 	 * 查询分页数据
@@ -87,7 +82,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 	public Page<${ClassName}> findPage(${ClassName} ${className}) {
 		return super.findPage(${className});
 	}
-	<% }else{ %>
 	
 	/**
 	 * 查询列表数据
@@ -98,7 +92,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 	public List<${ClassName}> findList(${ClassName} ${className}) {
 		return super.findList(${className});
 	}
-	<% } %>
 	<% for (child in table.childList){ %>
 	
 	/**
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
index e2bd64f3..16fd0176 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
@@ -10,9 +10,7 @@
  */
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
 
-<% if (table.isTreeEntity){ %>
 import java.util.List;
-<% } %>
 <% if (table.childList.~size > 0){ %>
 import org.springframework.beans.factory.annotation.Autowired;
 <% } %>
@@ -20,9 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
-<% if (!table.isTreeEntity){ %>
 import com.jeesite.common.entity.Page;
-<% } %>
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service;
 import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
 import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
@@ -81,7 +77,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 		return super.get(${className});
 		<% } %>
 	}
-	<% if(!table.isTreeEntity){ %>
 	
 	/**
 	 * 查询分页数据
@@ -93,7 +88,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 	public Page<${ClassName}> findPage(${ClassName} ${className}) {
 		return super.findPage(${className});
 	}
-	<% }else{ %>
 	
 	/**
 	 * 查询列表数据
@@ -104,7 +98,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv
 	public List<${ClassName}> findList(${ClassName} ${className}) {
 		return super.findList(${className});
 	}
-	<% } %>
 	<% for (child in table.childList){ %>
 	
 	/**
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/service.xml b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
index f5d56f48..5b9f1b80 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
@@ -10,17 +10,13 @@
  */
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
 
-<% if (table.isTreeEntity){ %>
 import java.util.List;
-<% } %>
 <% if (table.childList.~size > 0){ %>
 import org.springframework.beans.factory.annotation.Autowired;
 <% } %>
 import org.springframework.stereotype.Service;
 
-<% if (!table.isTreeEntity){ %>
 import com.jeesite.common.entity.Page;
-<% } %>
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Query'}Service;
 import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
 import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
@@ -63,7 +59,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Query'}Ser
 		return super.get(${className});
 		<% } %>
 	}
-	<% if(!table.isTreeEntity){ %>
 	
 	/**
 	 * 查询分页数据
@@ -75,7 +70,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Query'}Ser
 	public Page<${ClassName}> findPage(${ClassName} ${className}) {
 		return super.findPage(${className});
 	}
-	<% }else{ %>
 	
 	/**
 	 * 查询列表数据
@@ -86,7 +80,6 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Query'}Ser
 	public List<${ClassName}> findList(${ClassName} ${className}) {
 		return super.findList(${className});
 	}
-	<% } %>
 	<% for (child in table.childList){ %>
 	
 	/**