diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java index 72bb7be1..4b2b6202 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java @@ -31,8 +31,8 @@ public class DictDataController { * @return Object */ @GetMapping("/all") - public Object all() { - List list = iSettingDictDataService.all(); + public Object all(Map params) { + List list = iSettingDictDataService.all(params); return AjaxResult.success(list); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java index 28abbd48..a6d17027 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java @@ -19,7 +19,7 @@ public interface ISettingDictDataService { * @author fzr * @return List */ - List all(); + List all(Map params); /** * 字典数据列表 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java index 2d8e4e4e..2b3f6101 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java @@ -36,7 +36,7 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * @return List */ @Override - public List all() { + public List all(Map params) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("id,type_id,name,value,remark,sort,status,create_time,update_time"); queryWrapper.eq("is_delete", 0); @@ -44,6 +44,11 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { List dictDataList = dictDataMapper.selectList(queryWrapper); + dictDataMapper.setSearch(queryWrapper, params, new String[]{ + "like:key:str", + "=:status:int", + }); + List list = new LinkedList<>(); for (DictData dictData : dictDataList) { DictDataVo vo = new DictDataVo();