From 1d5153dae665ac722b4dd124c2cfd2d97801e26b Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Thu, 11 Aug 2022 11:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8F=AF=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxkj/admin/controller/setting/DictDataController.java  | 4 ++--
 .../admin/service/setting/ISettingDictDataService.java     | 2 +-
 .../service/setting/impl/SettingDictDataServiceImpl.java   | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

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<DictDataVo> list = iSettingDictDataService.all();
+    public Object all(Map<String, String> params) {
+        List<DictDataVo> 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<DictDataVo>
      */
-    List<DictDataVo> all();
+    List<DictDataVo> all(Map<String, String> 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<DictDataVo>
      */
     @Override
-    public List<DictDataVo> all() {
+    public List<DictDataVo> all(Map<String, String> params) {
         QueryWrapper<DictData> 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<DictData> dictDataList = dictDataMapper.selectList(queryWrapper);
 
+        dictDataMapper.setSearch(queryWrapper, params, new String[]{
+                "like:key:str",
+                "=:status:int",
+        });
+
         List<DictDataVo> list = new LinkedList<>();
         for (DictData dictData : dictDataList) {
             DictDataVo vo = new DictDataVo();