This commit is contained in:
suyl
2021-07-08 18:23:13 +08:00
parent 2d0824f82a
commit b7ed047e7c
6 changed files with 30 additions and 53 deletions

View File

@@ -1,17 +1,18 @@
package dao
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/model"
"github.com/jmoiron/sqlx"
)
func GetApps(db *sqlx.DB, id int, userID, mobile string) (apps []*model.Apps, err error) {
var sqlParams []interface{}
sql := `
SELECT *
FROM apps
WHERE 1 = 1
WHERE 1 = 1 AND deleted_at = ?
`
sqlParams := []interface{}{utils.DefaultTimeValue}
if id != 0 {
sql += " AND id = ?"
sqlParams = append(sqlParams, id)

View File

@@ -34,7 +34,7 @@ func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnl
count int
)
sqlCount := `
SELECT COUNT(*) count
SELECT COUNT(id) count
`
sql := `
SELECT *
@@ -97,7 +97,7 @@ func GetPrintMessagesPage(db *sqlx.DB, printNo, msgID, beginAt, endAt string, of
endTime = utils.Str2Time(endAt)
}
sqlCount := `
SELECT COUNT(*) count
SELECT COUNT(id) count
`
sql := `
SELECT *

View File

@@ -1,17 +1,18 @@
package dao
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/model"
"github.com/jmoiron/sqlx"
)
func GetUsers(db *sqlx.DB, userID, name, mobile string) (users []*model.User, err error) {
var sqlParams []interface{}
sql := `
SELECT *
FROM user
WHERE 1 = 1
WHERE 1 = 1 AND deleted_at = ?
`
sqlParams := []interface{}{utils.DefaultTimeValue}
if name != "" {
sql += " AND name LIKE ?"
sqlParams = append(sqlParams, "%"+name+"%")
@@ -49,9 +50,9 @@ func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err
sql := `
SELECT *
FROM user
WHERE name = ? AND password = ?
WHERE name = ? AND password = ? AND deleted_at = ?
`
sqlParams := []interface{}{name, password}
sqlParams := []interface{}{name, password, utils.DefaultTimeValue}
if err = db.Select(&users, sql, sqlParams...); err == nil {
return users[0], err
}
@@ -59,12 +60,12 @@ func GetUserForLogin(db *sqlx.DB, name, password string) (user *model.User, err
}
func GetMenus(db *sqlx.DB) (menus []*model.Menu, err error) {
var sqlParams []interface{}
sql := `
SELECT *
FROM menu
WHERE 1 = 1
WHERE 1 = 1 AND delete_at = ?
`
sqlParams := []interface{}{utils.DefaultTimeValue}
if err = db.Select(&menus, sql, sqlParams...); err == nil {
return menus, err
}