|
|
@ -592,7 +592,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
|
|
|
|
|
|
|
//我未阅读的和我未操作的
|
|
|
|
//我未阅读的和我未操作的
|
|
|
|
queryApproval := &Approval{NowUserId: in.UserID}
|
|
|
|
queryApproval := &Approval{NowUserId: in.UserID}
|
|
|
|
if in.ApprovalStatus == 0 { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing
|
|
|
|
if in.ApprovalStatus == 0 && in.SubmitterName == "" { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing
|
|
|
|
queryApproval.Status = StatusDoing
|
|
|
|
queryApproval.Status = StatusDoing
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|