Merge branch 'refs/heads/xiaolu' into master

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderCustomerFlowServiceImpl.java

@@ -32,10 +32,8 @@ import org.dromara.order.mapper.OrderCustomerFlowNodeMapper;
 import org.dromara.order.service.IOrderCustomerFlowService;
 import org.dromara.order.service.IOrderCustomerFlowNodeService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-import java.util.Objects;
+import java.util.*;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -250,7 +248,7 @@ public class OrderCustomerFlowServiceImpl  extends ServiceImpl<OrderCustomerFlow
             return;
         }
         //
-        Long firstNodeId = null;
+        List<OrderCustomerFlowNodeLink> orderCustomerFlowNodeLinks = new ArrayList<>();
         //先初始化流程节点
         for (OrderCustomerFlowNode orderCustomerFlowNode : orderCustomerFlowNodes) {
             OrderCustomerFlowNodeLink nodeLink = BeanUtil.toBean(orderCustomerFlowNode, OrderCustomerFlowNodeLink.class);
@@ -258,14 +256,12 @@ public class OrderCustomerFlowServiceImpl  extends ServiceImpl<OrderCustomerFlow
             nodeLink.setOrderId(orderId);
             nodeLink.setFlowId(flow.getId());
             nodeLinkService.save(nodeLink);
-            if (orderCustomerFlowNode.getNodeType() == 0){
-                firstNodeId = nodeLink.getId();
-            }
+            orderCustomerFlowNodeLinks.add(nodeLink);
         }
         OrderCustomerFlowLink flowLink = new OrderCustomerFlowLink();
         flowLink.setOrderId(orderId);
         flowLink.setFlowId(flow.getId());
-        flowLink.setNodeId(firstNodeId);
+        flowLink.setNodeId(orderCustomerFlowNodeLinks.get(0).getId());
         linkService.save(flowLink);
     }