综合搜索和前端对接 修改返回参类型

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);

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);
 

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