From 49e72ab6bff971c85164f6bf2fad27099987751a Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 13 Jul 2021 14:43:00 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/print.go | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go
index c1f26572a..e932638f3 100644
--- a/business/jxstore/cms/print.go
+++ b/business/jxstore/cms/print.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"net"
@@ -28,14 +29,16 @@ type PrintInfo struct {
 
 func AddPrinter(appID int, printers []*model.Printer) (err error) {
 	var (
-		db = dao.GetDB()
+		db   = dao.GetDB()
+		errs []error
 	)
 	if len(printers) > 50 {
 		return fmt.Errorf("一次最多只能绑定50台！")
 	}
 	for _, v := range printers {
 		if printers2, _ := dao.GetPrinters(db, appID, v.PrintNo); len(printers2) > 0 {
-			return fmt.Errorf("此应用已经绑定了该打印机！print_no : %v", v.PrintNo)
+			errs = append(errs, fmt.Errorf("此应用已经绑定了该打印机！print_no : %v", v.PrintNo))
+			continue
 		}
 		printer := &model.Printer{
 			AppID:   appID,
@@ -50,26 +53,36 @@ func AddPrinter(appID int, printers []*model.Printer) (err error) {
 		}
 		dao.WrapAddIDCULDEntity(printer, "")
 		if err = dao.CreateEntity(db, printer); err != nil {
-			return err
+			errs = append(errs, err)
+			continue
 		}
 	}
+	if len(errs) > 0 {
+		err = jxutils.BuildErr(errs)
+	}
 	return err
 }
 
 func DelPrinter(appID int, printNos []string) (err error) {
 	var (
-		db = dao.GetDB()
+		db   = dao.GetDB()
+		errs []error
 	)
 	for _, v := range printNos {
 		if printers, _ := dao.GetPrinters(db, appID, v); len(printers) == 0 {
-			return fmt.Errorf("该应用下未找到该打印机！print_no : %v", v)
+			errs = append(errs, fmt.Errorf("该应用下未找到该打印机！print_no : %v", v))
+			continue
 		} else {
 			printers[0].DeletedAt = time.Now()
 			if _, err = dao.UpdateEntity(db, printers[0], "DeletedAt"); err != nil {
-				return err
+				errs = append(errs, err)
+				continue
 			}
 		}
 	}
+	if len(errs) > 0 {
+		err = jxutils.BuildErr(errs)
+	}
 	return err
 }