bugfix

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

@@ -241,6 +241,9 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                     // 如果是撤回,就置为草稿
                     knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.DRAFT.getStatus()).set(Knowledge::getDraftBelongUserId, null)
                             .eq(Knowledge::getId, reqVO.getKnowledgeId()).update();
+                    // 并且草稿所属人应该是提交流程的人
+                    knowledgeService.lambdaUpdate().set(Knowledge::getDraftBelongUserId, submitFlowRecord.getSubmitUserId())
+                            .eq(Knowledge::getId, reqVO.getKnowledgeId()).update();
                 } else if (flowType.equals(FlowTypeEnum.DELETE.getFlowType())) {
                     knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.DELETE.getStatus()).set(Knowledge::getDraftBelongUserId, null)
                             .eq(Knowledge::getId, reqVO.getKnowledgeId()).update();

know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgePageResVO.java

@@ -24,4 +24,10 @@ public class KnowledgePageResVO extends Knowledge {
 
     @Schema(description = "是否支持撤回 0不支持 1支持")
     private Integer recallFlag = 0;
+
+    @Schema(description = "时效性 1长期有效 2临时有效")
+    private Integer timeliness;
+
+    @Schema(description = "政策类型")
+    private String policyType;
 }

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

@@ -31,7 +31,10 @@
     </sql>
     <select id="queryKnowledgePage" resultType="com.supervision.knowsub.vo.knowledge.KnowledgePageResVO">
         select
-        t1.*
+        t1.*,
+        t2.policy_type as policyType,
+        t2.timeliness as timeliness
+
         from ks_knowledge t1 left join ks_knowledge_info t2 on t1.info_id = t2.id
         <if test="status != null and status != 1">
             left join (select distinct knowledge_id as submitKnowledgeId