From 925d217427de36b41cda74b1c1d89e0d925447c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 29 Jul 2022 10:07:46 +0800 Subject: [PATCH] 1 --- dao/print_dao.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dao/print_dao.go b/dao/print_dao.go index 9aade1a..56d3dec 100644 --- a/dao/print_dao.go +++ b/dao/print_dao.go @@ -77,14 +77,13 @@ func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnl } sqlOther += " LIMIT ? OFFSET ?" sqlParams = append(sqlParams, pageSize, offset) - printers := make([]*model.Printer, 0, 0) - if err = db.Select(&printers, sql+sqlOther, sqlParams...); err == nil { - return &model.PagedInfo{ - TotalCount: count, - Data: printers, - }, err + + var printers []model.Printer + if err = db.Select(&printers, sql+sqlOther, sqlParams...); err != nil { + return nil, err } - return page, err + + return &model.PagedInfo{TotalCount: count, Data: printers}, err } func GetPrintMessagesPage(db *sqlx.DB, printNo, msgID, beginAt, endAt string, offset, pageSize int) (page *model.PagedInfo, err error) {