From c19ed0d35cd88cfe84b4dd07e8d28eea40e0662f Mon Sep 17 00:00:00 2001
From: ljt <18301674552@163.com>
Date: Wed, 20 Mar 2024 08:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=90=9C=E7=B4=A2=E5=92=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AF=B9=E6=8E=A5=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8F=82=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrSearchHistoryController.java        | 2 +-
 .../xiaoyao/ocr/service/IOcrSearchHistoryService.java     | 2 +-
 .../ocr/service/impl/OcrSearchHistoryServiceImpl.java     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java
index ee53e9fc..4f599876 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java
@@ -46,7 +46,7 @@ public class OcrSearchHistoryController  {
                                @RequestParam(value = "search", required = true) String search) {
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
         //执行查询方法
-        List<Map<Object,List<Map<String,String>>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname());
+        Map<Object, List<Map<String,String>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname());
 
         OcrSearchHistory ocrsearchhistory =new OcrSearchHistory();
         ocrsearchhistory.setHistoryname(search);
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java
index efc17fb0..8307cfe3 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java
@@ -16,7 +16,7 @@ import java.util.Map;
  * @since 2024-03-15
  */
 public interface IOcrSearchHistoryService extends IService<OcrSearchHistory> {
-    List<Map<Object,List<Map<String,String>>>> selectsearch(String search,String assignee);
+    Map<Object, List<Map<String,String>>> selectsearch(String search, String assignee);
 
     Map<Object,Object> toolscount(String userid);
 
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
index f0c01629..89000659 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
@@ -25,21 +25,21 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
     OcrSearchHistoryMapper ocrsearchhistorymapper;
 
     @Override
-    public List<Map<Object,List<Map<String,String>>>> selectsearch(String search, String assignee) {
+    public Map<Object, List<Map<String,String>>> selectsearch(String search, String assignee) {
         List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search);
         List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(search);
         List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(search);
 
 
-        List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>();
+//        List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>();
         Map<Object,List<Map<String,String>>> map=new HashMap<>();
         map.put("ai",strings1);
         map.put("preliminary",strings2);
         map.put("final",strings3);
-        list.add(map);
+//        list.add(map);
 
 
-        return list;
+        return map;
     }
 
     @Override