luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
jhc 2023-06-13 18:27:44 +08:00
parent 1e8243fb76
commit df62cc932e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/approval.go
View File

@ -633,7 +633,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
fmt.Printf("queryApproval %+v\n", queryApproval) fmt.Printf("queryApproval %+v\n", queryApproval)
fmt.Println("queryApproval request :==================== end ===================") fmt.Println("queryApproval request :==================== end ===================")
if in.SubmitterName == "" { if in.SubmitterName == "" && in.ApprovalStatus == 0 {
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的 DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的