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 38d147d7..ee53e9fc 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<List<Map<String, String>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname());
+        List<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/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java
index 613e90c6..17238f69 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java
@@ -3,7 +3,6 @@ package cn.jyjz.xiaoyao.ocr.dataDao;
 
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import liquibase.pro.packaged.S;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,11 +19,11 @@ import java.util.Map;
  */
 @Mapper
 public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
-        List<Map<String,String>> selectsearch1(@Param("search")String search,@Param("assignee") String assignee);
+        List<Map<String,String>> selectsearch1(@Param("search")String search);
 
-        List<Map<String,String>> selectsearch2(@Param("search")String search,@Param("assignee") String assignee);
+        List<Map<String,String>> selectsearch2(@Param("search")String search);
 
-        List<Map<String,String>> selectsearch3(@Param("search")String search,@Param("assignee") String assignee);
+        List<Map<String,String>> selectsearch3(@Param("search")String 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 6de2a28c..efc17fb0 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
@@ -3,7 +3,6 @@ package cn.jyjz.xiaoyao.ocr.service;
 
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -17,7 +16,7 @@ import java.util.Map;
  * @since 2024-03-15
  */
 public interface IOcrSearchHistoryService extends IService<OcrSearchHistory> {
-    List<List<Map<String,String>>> selectsearch(String search,String assignee);
+    List<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 786ec169..f0c01629 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,17 +25,19 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
     OcrSearchHistoryMapper ocrsearchhistorymapper;
 
     @Override
-    public List<List<Map<String,String>>> selectsearch(String search, String assignee) {
-        List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search, assignee);
-        List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(search, assignee);
-        List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(search, assignee);
+    public List<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<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(strings1);
-        list.add(strings2);
-        list.add(strings3);
 
         return list;
     }
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
index ccf1f1b0..6cb3270d 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
@@ -17,16 +17,14 @@
 
     <select id="selectsearch1" resultType="map">
         SELECT
-            r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS aiName
+            r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
         FROM
             ocr_taskchild_picture r
                 LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
                 LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
         WHERE
---             r.STATES = '1' AND
-           r.ASSIGNEE = #{assignee}
-          AND (r.PACKAGEID LIKE "%"#{search}"%"
+           (r.PACKAGEID LIKE "%"#{search}"%"
             OR img.taskName LIKE "%"#{search}"%"
             OR img.field1 LIKE "%"#{search}"%"
             OR img.field3 LIKE "%"#{search}"%")
@@ -37,15 +35,14 @@
     </select>
     <select id="selectsearch2" resultType="map">
         SELECT
-            r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS preliminaryName
+            r.ID  as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
         FROM
             ocr_taskchild_picture r
                 LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
                 LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
         WHERE
-            r.ASSIGNEE = #{assignee}
-          AND r.taskName IN ( '一级审批', '二级审批' )
+           r.taskName IN ( '一级审批', '二级审批' )
           AND (r.PACKAGEID LIKE "%"#{search}"%"
             OR img.taskName LIKE "%"#{search}"%"
             OR img.field1 LIKE "%"#{search}"%"
@@ -56,15 +53,14 @@
     </select>
     <select id="selectsearch3" resultType="map">
         SELECT
-            r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS finalName
+            r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
         FROM
             ocr_taskchild_picture r
                 LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
                 LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
         WHERE
-            r.ASSIGNEE = #{assignee}
-          AND r.taskName  = '三级审批'
+           r.taskName  = '最终审批'
           AND (r.PACKAGEID LIKE "%"#{search}"%"
             OR img.taskName LIKE "%"#{search}"%"
             OR img.field1 LIKE "%"#{search}"%"