|
@@ -17,6 +17,8 @@ func GetApprovalFlow(flowId int) (approvalFlow *approval_flow.ApprovalFlowItem,
|
|
|
err = errors.New("查询审批流程失败:Err:" + err.Error())
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ flowNodeList := make([]*approval_flow_node.ApprovalFlowNodeList, 0)
|
|
|
approvalFlowNodeList, err := approval_flow_node.GetListByFlowId(approvalFlow.FlowId, approvalFlow.CurrVersion)
|
|
|
if err != nil {
|
|
|
err = errors.New("查询审批节点失败:Err:" + err.Error())
|
|
@@ -37,9 +39,11 @@ func GetApprovalFlow(flowId int) (approvalFlow *approval_flow.ApprovalFlowItem,
|
|
|
}
|
|
|
approvalFlowNode.UserList = append(approvalFlowNode.UserList, userInfo)
|
|
|
}
|
|
|
+ if len(approvalFlowNode.UserList) > 0 {
|
|
|
+ flowNodeList = append(flowNodeList, approvalFlowNode)
|
|
|
+ }
|
|
|
}
|
|
|
- approvalFlow.NodeList = approvalFlowNodeList
|
|
|
-
|
|
|
+ approvalFlow.NodeList = flowNodeList
|
|
|
return
|
|
|
}
|
|
|
|