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); // 模板的分类,对代办进行分组过滤