fix: 报告审批

services/report_approve.go

@@ -489,7 +489,7 @@ func PassReportApprove(approveItem *report_approve.ReportApprove, recordItem *re
 				//	lastRoll = true
 				//	break
 				//}
-				if (k + 1) <= userLen {
+				if (k + 1) < userLen {
 					nextUser = currNode.Users[k+1]
 				}
 			}
@@ -499,7 +499,7 @@ func PassReportApprove(approveItem *report_approve.ReportApprove, recordItem *re
 		//}
 
 		// 当前节点下一个审批人, 生成下一个审批记录且return
-		if nextUser != nil {
+		if nextUser.UserId > 0 {
 			newRecord := new(report_approve.ReportApproveRecord)
 			newRecord.ReportApproveId = recordItem.ReportApproveId
 			newRecord.State = report_approve.ReportApproveStateApproving
@@ -545,7 +545,7 @@ func PassReportApprove(approveItem *report_approve.ReportApprove, recordItem *re
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.ReportApproveId, sysAdminId, sysAdminName)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.ReportApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName)
 			return
 		} else {
 			// 最后一个节点
@@ -592,7 +592,7 @@ func PassReportApprove(approveItem *report_approve.ReportApprove, recordItem *re
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.ReportApproveId, sysAdminId, sysAdminName)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.ReportApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName)
 			return
 		}
 	}
@@ -614,7 +614,7 @@ func PassReportApprove(approveItem *report_approve.ReportApprove, recordItem *re
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.ReportApproveId, sysAdminId, sysAdminName)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.ReportApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName)
 			return
 		}
 	}