瀏覽代碼

流程问题处理

yzc 1 年之前
父節點
當前提交
7ad5775aa1

+ 1 - 1
hx-flow/src/main/java/com/fjhx/flow/enums/HandleTypeEnum.java

@@ -17,7 +17,7 @@ public enum HandleTypeEnum {
     RETURN_TO_SUBMITTER(4, "退回到发起人"),
     RETURN_TO_SUBMITTER(4, "退回到发起人"),
     CANCELLATION(5, "作废"),
     CANCELLATION(5, "作废"),
     ADD_APPROVAL(6,"加签"),
     ADD_APPROVAL(6,"加签"),
-    TRANSFER(7,"交"),
+    TRANSFER(7,"交"),
     RETURN_TO_NODE(8,"退回")
     RETURN_TO_NODE(8,"退回")
     ;
     ;
 
 

+ 2 - 0
hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -443,6 +443,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
      * 跳转到指定节点
      * 跳转到指定节点
      */
      */
     private FlowResult returnToNode(FlowJumpContext context, JumpDto dto) {
     private FlowResult returnToNode(FlowJumpContext context, JumpDto dto) {
+        FlowDefinitionNode currentNode = context.getCurrentNode();
         if (ObjectUtil.isEmpty(dto.getHandleNodeId())) {
         if (ObjectUtil.isEmpty(dto.getHandleNodeId())) {
 
 
             FlowExample flowExample = context.getFlowExample();
             FlowExample flowExample = context.getFlowExample();
@@ -455,6 +456,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
             List<FlowDefinitionNode> flowDefinitionNodeList = flowDefinitionNodeService.list(
             List<FlowDefinitionNode> flowDefinitionNodeList = flowDefinitionNodeService.list(
                     q -> q.eq(FlowDefinitionNode::getFlowDefinitionId, flowExample.getDefinitionId())
                     q -> q.eq(FlowDefinitionNode::getFlowDefinitionId, flowExample.getDefinitionId())
                             .in(FlowDefinitionNode::getId, flowNodeIds)
                             .in(FlowDefinitionNode::getId, flowNodeIds)
+                            .ne(FlowDefinitionNode::getId,currentNode.getId())
             );
             );
 
 
             FlowResult flowResult = new FlowResult();
             FlowResult flowResult = new FlowResult();