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 19:56:26 +08:00
parent 9b0ba0dde3
commit 2a0e0c1cd5
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

@ -642,7 +642,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
} else { } else {
sonQuery := DB.Where(queryApproval) sonQuery := DB.Where(queryApproval)
if in.ApprovalStatus > StatusFail || in.ApprovalStatus == 0 { if in.ApprovalStatus > StatusFail || in.ApprovalStatus == 0 {
sonQuery.Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id"))) sonQuery.Where(DB.Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id")))
} }
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
sonQuery) sonQuery)