wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-11-13 18:16:59 +08:00
commit 0bceb56219
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -101,9 +101,11 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
LambdaQueryChainWrapper<PendingMessageRecord> query = pendingMessageRecordDao.lambdaQuery() LambdaQueryChainWrapper<PendingMessageRecord> query = pendingMessageRecordDao.lambdaQuery()
.eq(Objects.nonNull(pendingMessageState), PendingMessageRecord::getState, pendingMessageState) .eq(Objects.nonNull(pendingMessageState), PendingMessageRecord::getState, pendingMessageState)
.eq(Objects.nonNull(bizFinalState), PendingMessageRecord::getBizFinalState, bizFinalState) .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()); .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); buildPersonCondition(query, request.getWithIdentify(), request.getRoleCategory(), operator);
// 模板的分类，对代办进行分组过滤 // 模板的分类，对代办进行分组过滤