|
|
@ -592,7 +592,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
|
|
|
|
|
|
|
//我未阅读的和我未操作的
|
|
|
|
//我未阅读的和我未操作的
|
|
|
|
queryApproval := &Approval{NowUserId: in.UserID, Status: StatusDoing}
|
|
|
|
queryApproval := &Approval{NowUserId: in.UserID, Status: StatusDoing}
|
|
|
|
if in.ApprovalStatus <= StatusFail {
|
|
|
|
if in.ApprovalStatus <= StatusFail && in.ApprovalStatus > 0 {
|
|
|
|
queryApproval.Status = int8(in.ApprovalStatus)
|
|
|
|
queryApproval.Status = int8(in.ApprovalStatus)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if in.SubmitterName != "" {
|
|
|
|
if in.SubmitterName != "" {
|
|
|
|