|
|
|
@ -601,9 +601,9 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
queryApproval.SubmitterName = in.SubmitterName
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//if in.ApprovalStatus == 0 && in.SubmitterName == "" { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing
|
|
|
|
|
// queryApproval.Status = StatusDoing
|
|
|
|
|
//}
|
|
|
|
|
if in.ApprovalStatus == 0 && in.SubmitterName == "" { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing
|
|
|
|
|
queryApproval.Status = StatusDoing
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if in.ApprovalStatus <= StatusFail && in.ApprovalStatus > 0 { // 具体 的 审批状态
|
|
|
|
|
queryApproval.NowUserId = in.UserID
|
|
|
|
|