1
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flowFlag int) (printers []*model.Printer, err error) {
|
||||
func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flowFlag int, userId string) (printers []*model.Printer, err error) {
|
||||
sql := `
|
||||
SELECT *
|
||||
FROM printer
|
||||
@@ -36,6 +36,10 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flow
|
||||
sql += " AND flow_flag = ?"
|
||||
sqlParams = append(sqlParams, flowFlag)
|
||||
}
|
||||
if userId != "" {
|
||||
sql += " AND user_id = ?"
|
||||
sqlParams = append(sqlParams, userId)
|
||||
}
|
||||
if err = db.Select(&printers, sql, sqlParams...); err == nil {
|
||||
return printers, err
|
||||
}
|
||||
@@ -83,7 +87,6 @@ func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnl
|
||||
if err = db.Select(&printers, sql+sqlOther, sqlParams...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &model.PagedInfo{TotalCount: count, Data: printers}, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user