bugfix

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

@@ -185,7 +185,6 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
             // 如果当前节点的索引号和节点数量相等,说明是最后一个节点,这时说明流程走完了
             if (ruleOrderList.size() == index) {
                 // 这时走流程结束的流程
-
                 KnowledgeFlowRecord newKnowledgeFlowRecord = KnowledgeFlowRecord.builder().type(2)
                         .knowledgeId(knowledgeFlowTodo.getKnowledgeId())
                         .flowId(knowledgeFlowTodo.getFlowId())
@@ -201,9 +200,22 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                         .submitUserId(submitFlowRecord.getSubmitUserId())
                         .submitDeptId(submitFlowRecord.getSubmitDeptId()).build();
                 knowledgeFlowRecordService.save(newKnowledgeFlowRecord);
-                // 将知识的状态进行修改
-                knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.PASS.getStatus()).set(Knowledge::getDraftBelongUserId, null)
-                        .eq(Knowledge::getId, reqVO.getKnowledgeId()).update();
+                // 将知识的状态进行修改(需要修改为对应的状态,看提交的是什么流程)
+                Integer flowType = knowledgeFlowTodo.getFlowType();
+                // 如果是知识报送,就置为通过
+                if (flowType.equals(FlowTypeEnum.SUBMIT.getFlowType())) {
+                    knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.PASS.getStatus()).set(Knowledge::getDraftBelongUserId, null)
+                            .eq(Knowledge::getId, reqVO.getKnowledgeId()).update();
+                } else if (flowType.equals(FlowTypeEnum.RECALL.getFlowType())) {
+                    // 如果是撤回,就置为撤回
+                    knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.RECALL.getStatus()).set(Knowledge::getDraftBelongUserId, null)
+                            .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();
+                } else {
+                    throw new BusinessException("未知的流程类型");
+                }
             } else {
                 SystemFlowRule nextRule;
                 try {

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

@@ -112,6 +112,11 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
                 if (baseOperateAuthMap.containsKey(baseId) && baseOperateAuthMap.get(baseId).contains(FlowTypeEnum.RECALL.getFlowType())) {
                     knowledgePageResVO.setRecallFlag(1);
                 }
+                // 已发布的,也可以直接删除,但是也要校验权限
+                if (baseOperateAuthMap.containsKey(baseId) && baseOperateAuthMap.get(baseId).contains(FlowTypeEnum.DELETE.getFlowType())) {
+                    knowledgePageResVO.setDeleteFlag(1);
+                }
+
             } else if (StatusEnum.REJECT.getStatus().equals(status)) {
                 // 如果是驳回,就可以支持编辑和删除,但是需要校验是否需要有权限
                 if (baseOperateAuthMap.containsKey(baseId) && baseOperateAuthMap.get(baseId).contains(FlowTypeEnum.SUBMIT.getFlowType())) {