diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 1d1ab529..47f33d69 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -282,6 +282,9 @@ public class CasesServiceImpl implements ICasesService { query.setPageSize(caseVo.getPageSize()); page = casesDao.findPage(query.builder()); List list = page.getList(); + list.forEach(it->{ + it.setBreCommend(0); + }); if (CollUtil.isNotEmpty(list) && StrUtil.isNotBlank(caseVo.getUserId())) { List caseIds = list.stream().map(Cases::getId).collect(Collectors.toList()); QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class); @@ -289,15 +292,15 @@ public class CasesServiceImpl implements ICasesService { List subFilters = new ArrayList<>(); subFilters.add(FieldFilters.eq("pushUserId", caseVo.getUserId())); subFilters.add(FieldFilters.in("caseId", caseIds)); - subFilters.add(FieldFilters.eq("pushStatus", 4)); + subFilters.add(FieldFilters.eq("pushStatus", 3)); subFilters.add(FieldFilters.eq("deleted", Boolean.FALSE)); QueryBuilder queryBuilder = recommendCasesQuery.addFilters(subFilters) .addOrder("sysCreateTime", OrderDirection.DESC) - .addGroupBy("recommendId"); + .addGroupBy("caseId"); List pushRecords = casesRecommendPushRecordDao.findList(queryBuilder.builder()); if (CollUtil.isNotEmpty(pushRecords)) { - List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).collect(Collectors.toList()); + List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).distinct().collect(Collectors.toList()); QueryBuilder builder = QueryBuilder.from(CasesRecommend.class); builder.addField("new CasesRecommend(id,recommendOrgName)"); List recommendFilters = new ArrayList<>(); @@ -350,7 +353,7 @@ public class CasesServiceImpl implements ICasesService { .addGroupBy("caseId"); List pushRecords = casesRecommendPushRecordDao.findList(queryBuilder.builder()); if (CollUtil.isNotEmpty(pushRecords)) { - List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).collect(Collectors.toList()); + List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).distinct().collect(Collectors.toList()); QueryBuilder builder = QueryBuilder.from(CasesRecommend.class); List recommendFilters = new ArrayList<>(); recommendFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));