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 0c3b486f..52cff146 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 @@ -286,7 +286,7 @@ public class CasesServiceImpl implements ICasesService { query.setPageSize(caseVo.getPageSize()); page = casesDao.findPage(query.builder()); List list = page.getList(); - if (CollUtil.isNotEmpty(list)) { + if (CollUtil.isNotEmpty(list) && StrUtil.isNotBlank(caseVo.getUserId())) { List caseIds = list.stream().map(Cases::getId).collect(Collectors.toList()); QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class); recommendCasesQuery.addField("new CasesRecommendPushRecord(recommendId,caseId)"); @@ -840,8 +840,8 @@ public class CasesServiceImpl implements ICasesService { String accountId = current.getAccountId(); List result = new ArrayList<>(); try { - String hql = "select a.caseId FROM CasesRecommendPushRecord a left join Cases b ON a.caseId = b.id WHERE a.pushUserId=:1 b.deleted = false group by a.caseId ORDER By a.recommendTime DESC LIMIT "+CASE_LEN; - List listFields = casesRecommendDao.findListFields(hql, accountId); + String hql = "select a.caseId FROM CasesRecommendPushRecord a left join Cases b ON a.caseId = b.id WHERE a.pushUserId=?1 and b.deleted = false group by a.caseId ORDER By a.pushTime DESC"; + List listFields = casesRecommendDao.findListFields(hql, CASE_LEN, accountId); List caseIds = new ArrayList<>(); if (CollUtil.isNotEmpty(listFields)) { for (Object[] objs : listFields) { diff --git a/servers/boe-server-all/src/main/resources/log/logback-dev.xml b/servers/boe-server-all/src/main/resources/log/logback-dev.xml index 97f328fc..1c041e11 100644 --- a/servers/boe-server-all/src/main/resources/log/logback-dev.xml +++ b/servers/boe-server-all/src/main/resources/log/logback-dev.xml @@ -6,7 +6,7 @@ - + ${APP_NAME} diff --git a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java index 764c8079..7c442f90 100644 --- a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java +++ b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java @@ -7,14 +7,18 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.xboe.common.PageList; +import com.xboe.core.CurrentUser; import com.xboe.module.boecase.dto.CasePageVo; import com.xboe.module.boecase.entity.Cases; import com.xboe.module.boecase.service.ICasesService; +import com.xboe.school.vo.CasesVo; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; +import java.util.List; + import static org.junit.jupiter.api.Assertions.*; @SpringBootTest @@ -34,4 +38,12 @@ class CasesServiceImplTest { PageList casesV2 = casesService.queryPageCasesV2(pageVo); System.out.println(casesV2); } + + @Test + void queryCaseV2() { + CurrentUser currentUser = new CurrentUser(); + currentUser.setAccountId("12323"); + List list = casesService.caseIndexV2(currentUser); + System.out.println(list); + } } \ No newline at end of file