Merge branch 'master' of http://192.168.5.5:10010/r/aps/apsClient

zhangqian

2023-10-20 cffc76e87bc92dd4fb4617ba097103163adde6d4

 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 {