|
|
@ -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排序
|
|
|
|