From 4a81fc66bddc295eba858557e259a57f450d88e3 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sat, 11 Jun 2022 13:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=AD=97=E6=AE=B5=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysCategoryController.java       |  5 ++++-
 .../jero/modules/system/mapper/SysCategoryMapper.java  |  2 +-
 .../modules/system/mapper/xml/SysCategoryMapper.xml    |  1 -
 .../modules/system/service/ISysCategoryService.java    |  2 +-
 .../system/service/impl/SysCategoryServiceImpl.java    | 10 +++++-----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
index 3ccccf316..08adeb4de 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
@@ -115,7 +115,10 @@ public class SysCategoryController {
 	@PostMapping(value = "/queryPageList")
 	//	@RequiresPermissions("sys:category:queryPageList")
 	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
-		IPage<SysCategory> pageList= sysCategoryService.queryPageList(params);
+		List<SysCategory> categoryList = sysCategoryService.queryPageList(params);
+		IPage<SysCategory> pageList = new Page<>();
+		pageList.setRecords(categoryList);
+
 		return Result.OK(pageList);
 	}
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java
index d39cbd7c1..54b5b97a8 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java
@@ -19,7 +19,7 @@ import java.util.Map;
  */
 public interface SysCategoryMapper extends BaseMapper<SysCategory> {
 
-	IPage<SysCategory> queryPageList(IPage page, @Param("params") Map<String,Object> params);
+	List<SysCategory> queryPageList(@Param("params") Map<String,Object> params);
 
 	/**
 	  *  根据父级ID查询树节点数据
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
index 147a6b2b0..75170d381 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
@@ -22,7 +22,6 @@
 		del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id
 		from sys_category
 		where is_tag_dict=1 and sys_dict_id=#{params.sysDictId} and del_flag=0
-
 		<!--搜索条件:标签名称包含%,单独搜索-->
 		<if test="params.name != null and params.name != ''">
 			<choose>
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
index 827bdc465..029a83f3c 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
@@ -61,7 +61,7 @@ public interface ISysCategoryService extends IService<SysCategory> {
 	void deleteSysCategory(String ids);
 
 
-	IPage<SysCategory> queryPageList(Map<String, Object> params);
+	List<SysCategory> queryPageList(Map<String, Object> params);
 
 	/**
 	 * 获取树形结构
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
index acc4e45cc..62bfbdb6d 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
@@ -258,11 +258,11 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 	 * @return
 	 */
 	@Override
-	public IPage<SysCategory> queryPageList(Map<String, Object> params) {
-		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
-		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
-		IPage page = new Page(pageNo, pageSize);
-		IPage<SysCategory> result = sysCategoryMapper.queryPageList(page, params);
+	public List<SysCategory> queryPageList(Map<String, Object> params) {
+		List<SysCategory> result = sysCategoryMapper.queryPageList(params);
+		// 对所有的数据进行子表查询的数据
+
+
 		return result;
 	}