From 2e460d5e8739a2ccbf8ffa6bda5a9e9981f37321 Mon Sep 17 00:00:00 2001
From: Boolean <wxlhdm@qq.com>
Date: Wed, 28 Jun 2023 20:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=87=AA=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boecase/service/impl/CasesServiceImpl.java       |  6 +++---
 .../src/main/resources/log/logback-dev.xml           |  2 +-
 .../boecase/service/impl/CasesServiceImplTest.java   | 12 ++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

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<Cases> list = page.getList();
-        if (CollUtil.isNotEmpty(list)) {
+        if (CollUtil.isNotEmpty(list) && StrUtil.isNotBlank(caseVo.getUserId())) {
             List<String> 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<Cases> 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<Object[]> 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<Object[]> listFields = casesRecommendDao.findListFields(hql, CASE_LEN, accountId);
             List<Long> 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 @@
     <!--应用名称-->
     <property name="APP_NAME" value="boe-server-all"/>
     <!--日志文件保存路径-->
-    <property name="LOG_FILE_PATH" value="/app/logs/"/>
+    <property name="LOG_FILE_PATH" value="~/app/logs/"/>
     <contextName>${APP_NAME}</contextName>
     <!--每天记录日志到文件appender-->
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
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<Cases> casesV2 = casesService.queryPageCasesV2(pageVo);
         System.out.println(casesV2);
     }
+
+    @Test
+    void queryCaseV2() {
+        CurrentUser currentUser = new CurrentUser();
+        currentUser.setAccountId("12323");
+        List<CasesVo> list = casesService.caseIndexV2(currentUser);
+        System.out.println(list);
+    }
 }
\ No newline at end of file