|
|
|
@ -642,7 +642,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
} else {
|
|
|
|
|
sonQuery := DB.Where(queryApproval)
|
|
|
|
|
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(
|
|
|
|
|
sonQuery)
|
|
|
|
|