From 20fc17912e3aa8cabed8fa6538cc3d9d0c9c7234 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 12 Apr 2024 14:20:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=93=E5=BC=80=E5=85=A8=E6=96=87?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=EF=BC=8C=E4=B8=8D=E8=BE=93=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=BB=88=E5=AE=A1=E7=9A=84=E5=BE=85?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E7=9A=84=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E4=B8=89=E6=9D=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OcrSearchHistoryController.java | 15 ++++++++------- .../service/impl/OcrSearchHistoryServiceImpl.java | 11 +++++++---- .../mapper/oa/OcrSearchHistoryMapper.xml | 10 +++++++--- 3 files changed, 22 insertions(+), 14 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 f16c0ffb..69eeeaf4 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 @@ -55,13 +55,14 @@ public class OcrSearchHistoryController { //执行查询方法 Map>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname(),userToken.getUserid(),tenantId); - OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); - ocrsearchhistory.setHistoryname(search); - ocrsearchhistory.setTenantId(Long.valueOf(tenantId)); - ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid())); - ocrsearchhistory.setCreatedate(System.currentTimeMillis()); - ocrSearchHistoryService.save(ocrsearchhistory); - + if(StringUtils.isNotBlank(search)){ + OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); + ocrsearchhistory.setHistoryname(search); + ocrsearchhistory.setTenantId(Long.valueOf(tenantId)); + ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid())); + ocrsearchhistory.setCreatedate(System.currentTimeMillis()); + ocrSearchHistoryService.save(ocrsearchhistory); + } // return new ResponseEntity(selectsearch, HttpStatus.OK); return ResultVoUtil.success(selectsearch); 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 88749d65..b6e1472b 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 @@ -84,8 +84,10 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl frontmenuTList = isFrontmenuTService.queryUserMenuById(assignee); if(CollUtil.isNotEmpty(frontmenuTList)){ for (SFrontmenuT sFrontmenuT : frontmenuTList) { - if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){ - strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId); + if(StringUtils.isNotBlank(search)){ + 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>>> list = new ArrayList<>(); Map>> 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; } 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 93e5def9..f0b3fe59 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 @@ -31,9 +31,11 @@ r.ASSIGNEE = #{userid} AND r.STATES IN ('1','2') AND r.TASKNAME IN ( '一级审批', '二级审批' ) - AND (r.FROMTASKNAME LIKE "%"#{search}"%" + + AND (r.FROMTASKNAME LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%" OR img.field3 LIKE "%"#{search}"%") + 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}"%" + + AND (r.FROMTASKNAME LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%" OR img.field3 LIKE "%"#{search}"%") - AND r.TENANTID = #{tenantId} + + AND r.TENANTID = #{tenantId} ORDER BY r.CREATEDATE DESC LIMIT 3