#2469 空结点数据试算,按节点顺序排序

WeBankPartners · Dec 10, 2024 · 004f25e · 004f25e
1 parent 450d0ba
commit 004f25e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/platform-core/api/v1/process/manage.go b/platform-core/api/v1/process/manage.go
@@ -1753,10 +1753,16 @@ func QueryEmptyNodes(c *gin.Context) {
 		middleware.ReturnError(c, err)
 		return
 	}
+	sort.Sort(models.ProcDefSortNodes(procDefNodes))
+	orderIndex := 1
 	for _, node := range procDefNodes {
+		if node.NodeType == string(models.ProcDefNodeTypeHuman) || node.NodeType == string(models.ProcDefNodeTypeAutomatic) || node.NodeType == string(models.ProcDefNodeTypeData) || node.NodeType == models.JobSubProcType {
+			node.OrderedNo = orderIndex
+			orderIndex += 1
+		}
 		if node.NodeType == string(models.ProcDefNodeTypeAutomatic) || node.NodeType == string(models.ProcDefNodeSubProcess) || node.NodeType == string(models.ProcDefNodeTypeData) {
 			if !tools.Contains(nodeIds, node.Id) {
-				result = append(result, node.Name)
+				result = append(result, fmt.Sprintf("%d %s", node.OrderedNo, node.Name))
 			}
 		}
 	}