From 65ce12074ae923c41c8a48bc95d3a1187374c661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 16 Dec 2022 10:20:28 +0800
Subject: [PATCH] 1

---
 routers/v2_router.go                         | 2 +-
 services/print_server/app_server/temp.go     | 9 ++++++---
 services/print_server/app_server/wx_print.go | 4 ----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/routers/v2_router.go b/routers/v2_router.go
index a223eab..b3d7e9a 100644
--- a/routers/v2_router.go
+++ b/routers/v2_router.go
@@ -22,7 +22,7 @@ func InitV2System(v2 *gin.RouterGroup) {
 	//print
 	print := v2.Group("/print")
 	print.POST("/addPrinters", controllers.AddPrinters)
-	print.GET("/getPrinters", controllers.GetPrinters)
+	print.GET("/getSysPrinters", controllers.GetPrinters)
 	print.POST("/delPrinters", controllers.DelPrinters)
 	print.POST("/updatePrinter", controllers.UpdatePrinter)
 	print.POST("/testPrint", controllers.TestPrint)
diff --git a/services/print_server/app_server/temp.go b/services/print_server/app_server/temp.go
index bc77b46..03a0fe0 100644
--- a/services/print_server/app_server/temp.go
+++ b/services/print_server/app_server/temp.go
@@ -202,7 +202,7 @@ func (t *TempServer) DeleteTemp(id int, userId string) error {
 }
 
 // QueryTempList 查询用户模板
-func (t *TempServer) QueryTempList(userId, printSn string) ([]*tempModel.SystemTemp, error) {
+func (t *TempServer) QueryTempList(userId, printSn string) (map[string][]*tempModel.SystemTemp, error) {
 	userList, err := dao.SelectUserTemp(userId, printSn)
 	if err != nil {
 		return nil, err
@@ -213,8 +213,11 @@ func (t *TempServer) QueryTempList(userId, printSn string) ([]*tempModel.SystemT
 	if err != nil {
 		return nil, err
 	}
-	userList = append(userList, systemTemp...)
-	return userList, nil
+
+	tempMap := make(map[string][]*tempModel.SystemTemp, 0)
+	tempMap["user_temp"] = userList
+	tempMap["system_temp"] = systemTemp
+	return tempMap, nil
 }
 
 // QueryPrintTempByPrintNo 根据打印机id查询打印机
diff --git a/services/print_server/app_server/wx_print.go b/services/print_server/app_server/wx_print.go
index 505b843..da0c6df 100644
--- a/services/print_server/app_server/wx_print.go
+++ b/services/print_server/app_server/wx_print.go
@@ -126,10 +126,6 @@ func GetPrinters(appID int, printNo, name string, status, isOnline, offset, page
 	if err != nil {
 		return nil, err
 	}
-	page, err = dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize, "")
-	if err != nil {
-		return nil, err
-	}
 	print2 := page.Data.([]model.Printer)
 	//	make([]model.Printer, 0, 0)
 	//if err := json.Unmarshal([]byte(utils.Interface2String(page.Data)), &print2); err != nil {