diff --git a/tmp/hfb-finance-disbursement-filter/disbursement_list.go.original b/docs/MODIFIED_FILE index c42e5b3..eccf568 100644 --- a/tmp/hfb-finance-disbursement-filter/disbursement_list.go.original +++ b/docs/MODIFIED_FILE @@ -271,6 +271,13 @@ func (r *Repository) applyDisbursementFilters(db *gorm.DB, query DisbursementQue db = db.Where(`(d.business_no LIKE ? OR d.payee_name LIKE ? OR d.payee_phone LIKE ? OR d.uploader_name LIKE ? OR d.account_name LIKE ? OR d.account_no LIKE ?)`, like, like, like, like, like, like) } + if query.Operator != "" { + like := "%" + query.Operator + "%" + db = db.Where("(d.operator_name LIKE ? OR CAST(d.operator_id AS CHAR) LIKE ?)", like, like) + } + if query.OperatorID > 0 { + db = db.Where("d.operator_id = ?", query.OperatorID) + } if !query.StartDate.IsZero() && !query.EndDate.IsZero() { if query.DateType == "paid" { db = db.Where("d.paid_at >= ? AND d.paid_at <= ?", query.StartDate, query.EndDate)