From cffc76e87bc92dd4fb4617ba097103163adde6d4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 15:50:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/apsClient
---
nsq/msg_handler.go | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 1db651e..461d810 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -79,6 +79,7 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
+ var err error
if oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" {
if err = model.NewOrderSearch(db).SetId(oldWorkOrder.ID).Updates(&orderRecord); err != nil {
return err
@@ -264,8 +265,7 @@
if err == gorm.ErrRecordNotFound {
err = model.NewDeviceSearch().Create(deviceRecord)
} else {
- deviceRecord.ID = oldRecord.ID
- err = model.NewDeviceSearch().Save(deviceRecord)
+ err = model.NewDeviceSearch().SetID(oldRecord.ID).Save(deviceRecord)
}
if err != nil {
--
Gitblit v1.8.0