From f1727d5cdc433d03321691540bc61fdc5bdc9cec Mon Sep 17 00:00:00 2001
From: wangwenchao <wenchaowangcard@163.com>
Date: Wed, 21 Jun 2023 14:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=A1=88=E4=BE=8B=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99=E5=8F=8A=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=E4=B8=8D=E5=A5=BD=E4=BD=BF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=B9=B6=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xboe/module/boecase/api/CasesRecommendApi.java  | 13 +++++++------
 .../xboe/module/boecase/vo/CasesRecommendVo.java    |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java
index ff551ed7..544a926d 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java
@@ -54,19 +54,20 @@ public class CasesRecommendApi extends ApiBaseController {
     /**
      * 用于后台管理分页
      *
-     * @param pager
      * @param casesRecommendVo
      * @return
      */
     @PostMapping("/page")
-    public JsonResponse<PageList<CasesRecommend>> page(Pagination pager, CasesRecommendVo casesRecommendVo) {
-        PageList<CasesRecommend> page = iCasesRecommendService.page(pager.getPageIndex(), pager.getPageSize(), casesRecommendVo);
+    public JsonResponse<PageList<CasesRecommend>> page(@RequestBody CasesRecommendVo casesRecommendVo) {
+        PageList<CasesRecommend> page = iCasesRecommendService.page(casesRecommendVo.getPageIndex(), casesRecommendVo.getPageSize(), casesRecommendVo);
         // 组装查看率
         page.getList().forEach(it -> {
             List<CasesRecommendPushRecord> recordList = iCasesRecommendPushRecordService.findAllByRecommendId(it.getId());
-            // 查看率：查看率=案例查看人数(各案例查看人数之合）/（当条推荐记录包含的案例 × 用户数）
-            long viewCount = recordList.stream().filter(record -> record.getReadFlag().equals(1)).count();
-            it.setViewRate(String.valueOf(viewCount * 100 / recordList.size()).concat("%"));
+            if (CollectionUtil.isNotEmpty(recordList)){
+                // 查看率：查看率=案例查看人数(各案例查看人数之合）/（当条推荐记录包含的案例 × 用户数）
+                long viewCount = recordList.stream().filter(record -> record.getReadFlag().equals(1)).count();
+                it.setViewRate(String.valueOf(viewCount * 100 / recordList.size()).concat("%"));
+            }
         });
 
         return success(page);
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java
index 24988595..0e4438a1 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java
@@ -1,12 +1,13 @@
 package com.xboe.module.boecase.vo;
 
+import com.xboe.common.Pagination;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
-public class CasesRecommendVo {
+public class CasesRecommendVo extends Pagination {
 
     /** 推荐人姓名 */
     private String recommendName;