diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java index 8012413..13b267f 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java @@ -17,7 +17,9 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Slf4j @Service @@ -70,7 +72,8 @@ public class HomepageServiceImpl implements HomepageService { // 首先查询用户是否有审批的权限, List roleTypeList = user.getRoleTypeList(); log.info("用户角色信息:{}", JSONUtil.toJsonStr(roleTypeList)); - Long passTotalCount = knowledgeService.lambdaQuery().eq(Knowledge::getStatus, StatusEnum.PASS.getStatus()).count(); + Set passStatusSet = new HashSet<>(List.of(new Integer[]{2, 11, 12, 16, 17})); + Long passTotalCount = knowledgeService.lambdaQuery().in(Knowledge::getStatus, passStatusSet).count(); resVO.setKnowledgeCount(passTotalCount); // 如果用户有审批权限,则以审批人的视角 if (roleTypeList.contains(RoleTypeEnum.KNOWLEDGE_APPROVAL.getRoleType())) { @@ -100,7 +103,7 @@ public class HomepageServiceImpl implements HomepageService { resVO.setRejectProcessCount(NumberUtil.add(recallSubmitCount, recallDeleteCount, recallRecallCount).longValue()); resVO.setInvalidProcessCount(knowledgeSubmitRecordService.queryKnowledgeSubmitStatusCount(user.getId(), StatusEnum.INVALID.getStatus())); resVO.setPassProcessCount(knowledgeSubmitRecordService.queryKnowledgeSubmitStatusCount(user.getId(), StatusEnum.PASS.getStatus())); - }else { + } else { log.info("用户没有任何角色权限,就只展示全量的,其他的都是0"); } // 没有任何角色权限,就只展示全量的,其他的都是0 diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeSubmitRecordMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeSubmitRecordMapper.xml index cb6793f..f7a8e93 100644 --- a/know_sub_model/src/main/resources/mapper/KnowledgeSubmitRecordMapper.xml +++ b/know_sub_model/src/main/resources/mapper/KnowledgeSubmitRecordMapper.xml @@ -24,13 +24,13 @@ create_time,update_user_id,update_time