From 436056d733602b55b6ba890af31c3f41f6d26ed4 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 8 Aug 2022 17:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93-?=
 =?UTF-8?q?=E7=82=B9=E8=B5=9E=20=E6=94=B6=E8=97=8F=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProblemKnowledgeBaseEOServiceImpl.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 680113bf6..4ceb74f0b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.problemKnowledgeBase.entity.*;
+import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum;
+import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum;
 import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.*;
@@ -215,7 +217,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 				long praiseCount = praiseEOList.stream().filter(praiseEO -> {
 					boolean flag = false;
-					if(StringUtils.equals(data.getId(),praiseEO.getProblemKnowledgeBaseId())){
+					if(StringUtils.equals(data.getId(),praiseEO.getProblemKnowledgeBaseId())
+							&&StringUtils.equals(praiseEO.getPraiseStatus(), PraiseStatusEnum.PRAISE.getValue())){
 						flag = true;
 					}
 					return flag;
@@ -235,9 +238,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 					data.setPraiseEO(poblemKnowledgeBasePraiseEOS.get(0));
 				}
 
-				long browsingHistoryCount = browsingHistoryEOList.stream().filter(praiseEO -> {
+				long browsingHistoryCount = browsingHistoryEOList.stream().filter(baseBrowsingHistoryEO -> {
 					boolean flag = false;
-					if(StringUtils.equals(data.getId(),praiseEO.getProblemKnowledgeBaseId())){
+					if(StringUtils.equals(data.getId(),baseBrowsingHistoryEO.getProblemKnowledgeBaseId())){
 						flag = true;
 					}
 					return flag;
@@ -246,7 +249,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 				long collectCount = collectEOList.stream().filter(collectEO -> {
 					boolean flag = false;
-					if(StringUtils.equals(data.getId(),collectEO.getProblemKnowledgeBaseId())){
+					if(StringUtils.equals(data.getId(),collectEO.getProblemKnowledgeBaseId())
+							&& StringUtils.equals(collectEO.getCollectStatus(), CollectStatusEnum.COLLECT.getValue())){
 						flag = true;
 					}
 					return flag;