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

Revert "REQ-2010: 更新字段"

Browse Source 
This reverts commit 9aaefd1f50.
This commit is contained in:
yanglin 2024-03-01 15:45:41 +08:00
parent 9aaefd1f50
commit d1ed8d556d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,19 +218,19 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
buildHideUntil(query);
// 构建人维度的查询条件
buildPersonCondition(query, request.getWithIdentify(), request.getRoleCategory(), operator);
List<String> determinedTemplateCodes = determinePageQueryTemplateCodes(request);
if (CollectionUtils.isEmpty(determinedTemplateCodes)) {
List<String> templateCodes = determinePageQueryTemplateCodes(request);
if (CollectionUtils.isEmpty(templateCodes)) {
// 如果该分类未关联任何模板，直接返回空集合
log.info("there is not any template matched... appTerminal:[{}]", request.getAppTerminalType());
return AnalysisPage.emptyPage(request.getPage(), request.getPageSize());
}
query.in(PendingMessageRecord::getTemplateCode, determinedTemplateCodes);
query.in(PendingMessageRecord::getTemplateCode, templateCodes);
// query.groupBy(PendingMessageRecord::getTemplateCode,PendingMessageRecord::getBizCode);
// 构建排序条件
buildSortCondition(query, request.getOrderFields(), pendingMessageState);
IPage<PendingMessageRecord> page = request.toPage();
List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordMapper.selectPageWithCustomSql(query.getWrapper(), page);
List<String> templateCodes = pendingMessageRecords.stream().map(PendingMessageRecord::getTemplateCode)
templateCodes = pendingMessageRecords.stream().map(PendingMessageRecord::getTemplateCode)
.collect(Collectors.toList());
List<MessageTemplateDTO> messageTemplates = messageTemplateNewService.listByTemplateCodes(templateCodes);
List<PendingMessageResponse> responseRecords = pendingMessageRecords.stream()
@ -251,7 +251,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
if (resultPage.isEnableAnalysis()) {
resultPage.addAnalysis("terminalConfig", getTerminalConfigInfo());
}
resultPage.addAnalysis("templateCodes", new HashSet<>(determinedTemplateCodes));
resultPage.addAnalysis("templateCodes", new HashSet<>(templateCodes));
resultPage.addAnalysis("personId", request.getPersonId());
resultPage.addAnalysis("operator", operator);
resultPage.addAnalysis("ouId", request.getOuId());