bugfix

know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java

@@ -66,7 +66,7 @@ public class KnowledgeFlowController {
     @Operation(summary = "查询知识库流转记录")
     @Parameters({
             @Parameter(name = "knowledgeId", description = "审批状态 1未审批 2已审批", in = ParameterIn.QUERY),
-            @Parameter(name = "flowId", description = "标题,支持模糊", in = ParameterIn.QUERY)
+            @Parameter(name = "flowId", description = "流程ID,可不填", in = ParameterIn.QUERY)
     })
     @GetMapping("queryKnowledgeFlowRecord")
     public List<KnowledgeFlowRecordResVO> queryKnowledgeFlowRecord(String knowledgeId, @RequestParam(required = false) String flowId) {

know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java

@@ -28,9 +28,9 @@ public class KnowledgeManageController {
 
     private final KnowledgeManageService knowledgeManageService;
 
-    @Operation(summary = "查询知识库分页")
+    @Operation(summary = "查询知识库分页-除全部可以看所有外,其他tab都是看到自己报送的知识的状态(或参与过的)")
     @Parameters({
-            @Parameter(name = "status", description = "流转状态 为空查全部,1草稿 2通过 3驳回 4已撤回 5已失效 6已删除 10待审批(新增) 11待审批(删除) 12待审批(撤回)", in = ParameterIn.QUERY),
+            @Parameter(name = "status", description = "流转状态 为空查全部,1草稿 2通过 3驳回 4已撤回 5已失效 6已删除 9待审批(这里包含了10,11,12,统一用9)", in = ParameterIn.QUERY),
             @Parameter(name = "title", description = "标题,支持模糊", in = ParameterIn.QUERY),
             @Parameter(name = "publishDeptId", description = "发文部门id", in = ParameterIn.QUERY),
             @Parameter(name = "baseId", description = "应用字库ID", in = ParameterIn.QUERY),

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java

@@ -114,15 +114,15 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                 .submitDeptId(deptId)
                 .build();
         knowledgeFlowRecordService.save(knowledgeFlowRecord);
-        // 如果是报送的话,需要记录报送人
-        if (FlowTypeEnum.SUBMIT.equals(flowTypeEnum)){
+        // 只要是发起了审批流程,不管是什么流程,都进行记录发起人
         KnowledgeSubmitRecord knowledgeSubmitRecord = new KnowledgeSubmitRecord();
         knowledgeSubmitRecord.setKnowledgeId(knowledge.getId());
         knowledgeSubmitRecord.setFlowId(systemFlowTypeRelation.getFlowId());
+        knowledgeSubmitRecord.setFlowType(systemFlowTypeRelation.getFlowType());
         knowledgeSubmitRecord.setSubmitUserId(userId);
         knowledgeSubmitRecord.setSubmitDeptId(deptId);
         knowledgeSubmitRecordService.save(knowledgeSubmitRecord);
-        }
+
         // 生成下一个节点的TODO
         for (SystemFlowRuleUser todoUser : nextRuleUserList) {
             KnowledgeFlowTodo todo = new KnowledgeFlowTodo();

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java

@@ -57,6 +57,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
                                                         LocalDateTime publishDateBegin,
                                                         LocalDateTime publishDateEnd, Integer pageNum, Integer pageSize) {
         String userId = UserUtil.getUser().getId();
+        // 除全部可以看所有外,其他tab都是看到自己报送的知识的状态(或参与过的)
         IPage<KnowledgePageResVO> knowledgeIPage = knowledgeService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, userId, pageNum, pageSize);
         List<KnowledgePageResVO> records = knowledgeIPage.getRecords();
         if (CollUtil.isEmpty(records)) {

know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeSubmitRecord.java

@@ -31,6 +31,11 @@ public class KnowledgeSubmitRecord implements Serializable {
      */
     private String flowId;
 
+    /**
+     * 流程类型 1知识报送 2:知识撤回 3 知识删除
+     */
+    private Integer flowType;
+
     /**
      * 本次报送人ID
      */

know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml

@@ -33,13 +33,29 @@
         select
         t1.*
         from ks_knowledge t1 left join ks_knowledge_info t2 on t1.info_id = t2.id
-        <where>
-            <if test="status == null">
-                and ( draft_belong_user_id = #{userId} or status != 1)
-            </if>
-            <if test="status != null">
-                and ( status = #{status} )
+        <if test="status != null and status != 1">
+            left join (select distinct knowledge_id as submitKnowledgeId
+            from ks_knowledge_submit_record
+            where submit_user_id = #{userId}) t3
+            on t3.submitKnowledgeId = t1.id
         </if>
+        <where>
+            <choose>
+                <when test="status == null">
+                    -- 如果为空,是查全部通过的
+                    and ( status = 2)
+                </when>
+                <when test="status == 1">
+                    -- 如果是1,只查自己的草稿
+                    and ( draft_belong_user_id = #{userId} and status = 1)
+                </when>
+                <when test="status == 9">
+                    and ( status in (10,11,12) and t3.submitKnowledgeId is not null)
+                </when>
+                <otherwise>
+                    and ( status = #{status} and t3.submitKnowledgeId is not null )
+                </otherwise>
+            </choose>
             <if test="title != null and title != ''">
                 and title like concat('%',#{title},'%')
             </if>

know_sub_model/src/main/resources/mapper/KnowledgeSubmitRecordMapper.xml

@@ -8,6 +8,7 @@
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="knowledgeId" column="knowledge_id" jdbcType="VARCHAR"/>
         <result property="flowId" column="flow_id" jdbcType="VARCHAR"/>
+        <result property="flowType" column="flow_type" jdbcType="INTEGER"/>
         <result property="submitUserId" column="submit_user_id" jdbcType="VARCHAR"/>
         <result property="submitDeptId" column="submit_dept_id" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
@@ -17,7 +18,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,knowledge_id,flow_id,
+        id
+        ,knowledge_id,flow_id,
         submit_user_id,submit_dept_id,create_user_id,
         create_time,update_user_id,update_time
     </sql>
@@ -26,7 +28,8 @@
         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
+                            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>