1
This commit is contained in:
@@ -251,13 +251,9 @@ func GetPrintMessages(appID int, tokenInfo *model.TokenInfo, printNo, msgID stri
|
|||||||
var (
|
var (
|
||||||
db = globals.GetDB()
|
db = globals.GetDB()
|
||||||
)
|
)
|
||||||
fmt.Println(fmt.Sprintf("----------------------------:=%s", printNo))
|
if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
|
||||||
fmt.Println(fmt.Sprintf("----------------------------:=%s", msgID))
|
return nil, fmt.Errorf("未查询到此应用!app_id:%d", appID)
|
||||||
fmt.Println(fmt.Sprintf("----------------------------:=%s", beginAt))
|
}
|
||||||
fmt.Println(fmt.Sprintf("----------------------------:=%s", endAt))
|
|
||||||
//if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
|
|
||||||
// return nil, fmt.Errorf("未查询到此应用!app_id:%d", appID)
|
|
||||||
//}
|
|
||||||
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0, "")
|
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0, "")
|
||||||
if len(printers) == 0 {
|
if len(printers) == 0 {
|
||||||
return nil, fmt.Errorf("未在该应用下查到此打印机!app_id: %d, print_no: %s", appID, printNo)
|
return nil, fmt.Errorf("未在该应用下查到此打印机!app_id: %d, print_no: %s", appID, printNo)
|
||||||
|
|||||||
@@ -184,13 +184,13 @@ func GetPrintMessages(c *gin.Context, appID int, tokenInfo *model.TokenInfo, pri
|
|||||||
var (
|
var (
|
||||||
db = globals.GetDB()
|
db = globals.GetDB()
|
||||||
)
|
)
|
||||||
if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
|
//if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
|
||||||
return nil, fmt.Errorf("未查询到此应用!app_id:%d", appID)
|
// return nil, fmt.Errorf("未查询到此应用!app_id:%d", appID)
|
||||||
}
|
//}
|
||||||
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0, "")
|
//printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0, "")
|
||||||
if len(printers) == 0 {
|
//if len(printers) == 0 {
|
||||||
return nil, fmt.Errorf("未在该应用下查到此打印机!app_id: %d, print_no: %s", appID, printNo)
|
// return nil, fmt.Errorf("未在该应用下查到此打印机!app_id: %d, print_no: %s", appID, printNo)
|
||||||
}
|
//}
|
||||||
return dao.GetPrintMessagesPage(db, printNo, msgID, beginAt, endAt, offset, pageSize)
|
return dao.GetPrintMessagesPage(db, printNo, msgID, beginAt, endAt, offset, pageSize)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user