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 { 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 { + 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 { 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;