diff --git a/repository/charge.go b/repository/charge.go
index 1857b66..573badb 100644
--- a/repository/charge.go
+++ b/repository/charge.go
@@ -74,13 +74,13 @@ func (cr _ChargeRepository) FindCharges(page uint, beginTime, endTime *types.Dat
 	}
 
 	if beginTime != nil {
-		chargeQuery = chargeQuery.Where(goqu.I("c.charge_to").Gte(*beginTime))
-		countQuery = countQuery.Where(goqu.I("c.charge_to").Gte(*beginTime))
+		chargeQuery = chargeQuery.Where(goqu.I("c.created_at").Gte(beginTime.ToBeginningOfDate()))
+		countQuery = countQuery.Where(goqu.I("c.created_at").Gte(beginTime.ToBeginningOfDate()))
 	}
 
 	if endTime != nil {
-		chargeQuery = chargeQuery.Where(goqu.I("c.charge_to").Lte(*endTime))
-		countQuery = countQuery.Where(goqu.I("c.charge_to").Lte(*endTime))
+		chargeQuery = chargeQuery.Where(goqu.I("c.created_at").Lte(endTime.ToEndingOfDate()))
+		countQuery = countQuery.Where(goqu.I("c.created_at").Lte(endTime.ToEndingOfDate()))
 	}
 
 	chargeQuery = chargeQuery.Order(goqu.I("c.created_at").Desc())
@@ -92,7 +92,7 @@ func (cr _ChargeRepository) FindCharges(page uint, beginTime, endTime *types.Dat
 	countSql, countArgs, _ := countQuery.Prepared(true).ToSQL()
 
 	var (
-		charges []*model.UserChargeDetail
+		charges []*model.UserChargeDetail = make([]*model.UserChargeDetail, 0)
 		total   int64
 	)
 	if err := pgxscan.Select(ctx, global.DB, &charges, chargeSql, chargeArgs...); err != nil {