修改
This commit is contained in:
parent
1e8243fb76
commit
df62cc932e
@ -633,7 +633,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
||||
fmt.Printf("queryApproval %+v\n", queryApproval)
|
||||
fmt.Println("queryApproval request :==================== end ===================")
|
||||
|
||||
if in.SubmitterName == "" {
|
||||
if in.SubmitterName == "" && in.ApprovalStatus == 0 {
|
||||
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
|
||||
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
|
||||
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的
|
||||
|
Loading…
Reference in New Issue
Block a user