From 80b9cae19232ee6fcba45c59c4f8a9b771a4d808 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 6 Jun 2022 15:36:32 +0800
Subject: [PATCH] =?UTF-8?q?bug53616=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysDictItemController.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
index 443b840af..efc2ea4fa 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
@@ -10,7 +10,6 @@ import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.enums.FixedFieldEnum;
 import com.jero.modules.enums.IsTagDict;
@@ -66,9 +65,18 @@ public class SysDictItemController {
 	public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
-		QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
-		queryWrapper.orderByDesc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0);
+//		QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
 		Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
+		QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
+		queryWrapper.orderByDesc("sort_order")
+				.eq("del_flag",CommonConstant.DEL_FLAG_0)
+				.eq("dict_id",sysDictItem.getDictId());
+		if(StringUtils.isNotEmpty(sysDictItem.getItemText())){
+			queryWrapper.like("item_text",sysDictItem.getItemText());
+		}
+		if(sysDictItem.getStatus() != null){
+			queryWrapper.like("status",sysDictItem.getStatus());
+		}
 		IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);