From 992c839b043b156951e234ca774bf3c441936851 Mon Sep 17 00:00:00 2001 From: luofu Date: Mon, 13 Nov 2023 18:16:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-1507):=20=E5=BE=85=E5=8A=9E=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=8F=8A=E7=BB=9F=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 修改： 1、待办分页查询及统计的相关接口实现； 影响： 无 --- .../message/service/impl/PendingMessageNewServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java index ab35f5b9..71800e3d 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java @@ -101,9 +101,11 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { LambdaQueryChainWrapper query = pendingMessageRecordDao.lambdaQuery() .eq(Objects.nonNull(pendingMessageState), PendingMessageRecord::getState, pendingMessageState) .eq(Objects.nonNull(bizFinalState), PendingMessageRecord::getBizFinalState, bizFinalState) - .and(v -> v.like(StringUtils.isNotBlank(request.getTitle()), PendingMessageRecord::getTitle, request.getTitle()) - .or().like(StringUtils.isNotBlank(request.getTitle()), PendingMessageRecord::getPromoterName, request.getTitle())) .eq(Objects.nonNull(request.getWorkspaceId()), PendingMessageRecord::getOrgId, request.getWorkspaceId()); + if (StringUtils.isNotBlank(request.getTitle())) { + query.and(v -> v.like(PendingMessageRecord::getTitle, request.getTitle()) + .or().like(PendingMessageRecord::getPromoterName, request.getTitle())); + } // 构建人维度的查询条件 buildPersonCondition(query, request.getWithIdentify(), request.getRoleCategory(), operator); // 模板的分类，对代办进行分组过滤