From 67323144e52076fbc196b7989c990cbcaf1cea89 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Tue, 9 Jul 2024 16:58:39 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../knowsub/service/impl/HomepageServiceImpl.java  |  7 +++++--
 .../mapper/KnowledgeSubmitRecordMapper.xml         | 14 +++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

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<Integer> roleTypeList = user.getRoleTypeList();
         log.info("用户角色信息:{}", JSONUtil.toJsonStr(roleTypeList));
-        Long passTotalCount = knowledgeService.lambdaQuery().eq(Knowledge::getStatus, StatusEnum.PASS.getStatus()).count();
+        Set<Integer> 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
     </sql>
     <select id="queryKnowledgeSubmitTodoCount" resultType="java.lang.Long">
-        select count(distinct t1.knowledge_id)
-        from ks_knowledge_submit_record t1
-                 left join (select flow_id, knowledge_id
-                            from ks_knowledge_flow_todo
-                            group by flow_id, knowledge_id) t3
-                           on t1.flow_id = t3.flow_id and t1.knowledge_id = t3.knowledge_id
-        where t1.submit_user_id = #{userId}
+        select count(t1.id)
+        from ks_knowledge t1
+                 left join (select distinct knowledge_id as submitKnowledgeId
+                            from ks_knowledge_submit_record
+                            where submit_user_id = #{userId}) t3
+                           on t3.submitKnowledgeId = t1.id
+        where (status in (10, 11, 12) and t3.submitKnowledgeId is not null)
 
     </select>