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 14:40:39 +08:00
parent 00830ff6e8
commit efcd9fcdce
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/model/approval.go
View File

@ -610,12 +610,15 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
} }
s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id") s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id")
/*modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( if queryApproval.SubmitterName == "" && in.Status == 0 {
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 */
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
DB.Where(queryApproval). // 我需要审批的 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))) // 已完成，抄送给我的
} else {
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
DB.Where(queryApproval)) // 我需要审批的
}
modelObj.Count(&count) modelObj.Count(&count)
if len(ids) > 0 { //根据具体id排序 if len(ids) > 0 { //根据具体id排序