- 删除网络打印机时,修复printerVendorID为0的错误

This commit is contained in:
gazebo
2019-04-10 11:03:17 +08:00
parent ac98b753ae
commit 0f38cadb5f

View File

@@ -385,25 +385,27 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
} else { } else {
store.PrinterVendorID = int(utils.Interface2Int64WithDefault(valid["printerVendorID"], 0)) store.PrinterVendorID = int(utils.Interface2Int64WithDefault(valid["printerVendorID"], 0))
} }
if valid["printerSN"] == nil { if store.PrinterVendorID > 0 {
valid["printerSN"] = store.PrinterSN if valid["printerSN"] == nil {
} valid["printerSN"] = store.PrinterSN
if valid["printerKey"] == nil { }
valid["printerKey"] = store.PrinterKey if valid["printerKey"] == nil {
} valid["printerKey"] = store.PrinterKey
var handler partner.IPrinterHandler }
if handler, err = netprinter.GetHandlerFromStore(store); err != nil { var handler partner.IPrinterHandler
return 0, err if handler, err = netprinter.GetHandlerFromStore(store); err != nil {
} return 0, err
newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name) }
if err = err2; err != nil { newID1, newID2, err2 := handler.RegisterPrinter(ctx, valid["printerSN"].(string), valid["printerKey"].(string), store.Name)
return 0, err if err = err2; err != nil {
} return 0, err
if newID1 != "" { }
valid["printerSN"] = newID1 if newID1 != "" {
} valid["printerSN"] = newID1
if newID2 != "" { }
valid["printerKey"] = newID2 if newID2 != "" {
valid["printerKey"] = newID2
}
} }
} }