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> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); - queryWrapper.orderByDesc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0); +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + QueryWrapper 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 pageList = sysDictItemService.page(page, queryWrapper); result.setSuccess(true); result.setResult(pageList);