fix:打开全文检索，不输入数据的情况下需要有一个默认展示，展示任务审批和任务终审的待审批状态的最新三条数据

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java

@@ -55,13 +55,14 @@ public class OcrSearchHistoryController  {
         //执行查询方法
         Map<Object, List<Map<String,String>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname(),userToken.getUserid(),tenantId);
 
-        OcrSearchHistory ocrsearchhistory =new OcrSearchHistory();
+        if(StringUtils.isNotBlank(search)){
-        ocrsearchhistory.setHistoryname(search);
+            OcrSearchHistory ocrsearchhistory =new OcrSearchHistory();
-        ocrsearchhistory.setTenantId(Long.valueOf(tenantId));
+            ocrsearchhistory.setHistoryname(search);
-        ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid()));
+            ocrsearchhistory.setTenantId(Long.valueOf(tenantId));
-        ocrsearchhistory.setCreatedate(System.currentTimeMillis());
+            ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid()));
-        ocrSearchHistoryService.save(ocrsearchhistory);
+            ocrsearchhistory.setCreatedate(System.currentTimeMillis());
-
+            ocrSearchHistoryService.save(ocrsearchhistory);
+        }
 //        return new ResponseEntity<Object>(selectsearch, HttpStatus.OK);
 
         return ResultVoUtil.success(selectsearch);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java

@@ -84,8 +84,10 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         List<SFrontmenuT> frontmenuTList = isFrontmenuTService.queryUserMenuById(assignee);
         if(CollUtil.isNotEmpty(frontmenuTList)){
             for (SFrontmenuT sFrontmenuT : frontmenuTList) {
-                if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){
+                if(StringUtils.isNotBlank(search)){
-                    strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId);
+                    if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){
+                        strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId);
+                    }
                 }
                 if(sFrontmenuT.getResKey().equals(FrontMenuEnum.TASKMAIN.getResKey())){
                     strings2 = ocrsearchhistorymapper.selectsearch2(assignee,search,tenantId);
@@ -98,12 +100,13 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
 
 //        List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>();
         Map<Object,List<Map<String,String>>> map=new HashMap<>();
-        map.put("ai",strings1);
+        if(StringUtils.isNotBlank(search)){
+            map.put("ai",strings1);
+        }
         map.put("preliminary",strings2);
         map.put("final",strings3);
 //        list.add(map);
 
-
         return map;
     }
 

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml

@@ -31,9 +31,11 @@
             r.ASSIGNEE = #{userid} AND
             r.STATES IN ('1','2') AND
             r.TASKNAME IN ( '一级审批', '二级审批' )
-          AND (r.FROMTASKNAME LIKE "%"#{search}"%"
+        <if test="search != null and search != ''">
+            AND (r.FROMTASKNAME LIKE "%"#{search}"%"
             OR img.field1 LIKE "%"#{search}"%"
             OR img.field3 LIKE "%"#{search}"%")
+        </if>
           AND r.TENANTID = #{tenantId}
         ORDER BY
             r.CREATEDATE DESC
@@ -49,10 +51,12 @@
             r.ASSIGNEE = #{userid} AND
             r.STATES = '3' AND
             r.TASKNAME = '最终审批'
-          AND (r.FROMTASKNAME LIKE "%"#{search}"%"
+        <if test="search != null and search != ''">
+            AND (r.FROMTASKNAME LIKE "%"#{search}"%"
             OR img.field1 LIKE "%"#{search}"%"
             OR img.field3 LIKE "%"#{search}"%")
-          AND r.TENANTID = #{tenantId}
+        </if>
+        AND r.TENANTID = #{tenantId}
         ORDER BY
             r.CREATEDATE DESC
             LIMIT 3