From 6b779c5692d75430e47f58c3921e9645bee661d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 28 Jul 2022 18:26:42 +0800
Subject: [PATCH] 1

---
 dao/print_dao.go | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/dao/print_dao.go b/dao/print_dao.go
index 7d62009..89bede1 100644
--- a/dao/print_dao.go
+++ b/dao/print_dao.go
@@ -41,17 +41,10 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flow
 }
 
 func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) {
-	var (
-		printers []*model.Printer
-		count    int
-	)
-	sqlCount := `
-		SELECT COUNT(id) count
-	`
-	sql := `
-		SELECT id,created_at,updated_at,deleted_at,last_operator, app_id,print_no,print_key,name,status,is_online,icc_id,sound,volume,flow_flag,offline_count,user_id 
-	`
-	sqlOther := `FROM printer WHERE 1 = 1 AND deleted_at = ?`
+	sqlCount := `SELECT COUNT(id) count `
+	// id,created_at,updated_at,deleted_at,last_operator, app_id,print_no,print_key,name,status,is_online,icc_id,sound,volume,flow_flag,offline_count,user_id
+	sql := `SELECT * `
+	sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?`
 	sqlParams := []interface{}{utils.DefaultTimeValue}
 	if appID != 0 {
 		sqlOther += " AND app_id = ?"
@@ -78,12 +71,14 @@ func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnl
 		sqlParams = append(sqlParams, userId)
 	}
 	//查总数
+	count := 0
 	row := db.DB.QueryRow(sqlCount+sqlOther, sqlParams...)
 	if err = row.Scan(&count); err != nil {
 		return page, err
 	}
 	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,