From eb65f4c3c6903b11424eeaefe46653acedf24448 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 09:40:22 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/serviceOrder.go | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/service/serviceOrder.go b/service/serviceOrder.go
index 2c2e80d..c33f292 100644
--- a/service/serviceOrder.go
+++ b/service/serviceOrder.go
@@ -30,7 +30,7 @@
}
func (ServiceOrderService) GetServiceOrderList() ([]*model.ServiceOrder, int64, int) {
- list, total, err := model.NewServiceOrderSearch().Find()
+ list, total, err := model.NewServiceOrderSearch().SetPreload(true).Find()
if err != nil {
return nil, 0, ecode.DBErr
}
@@ -46,9 +46,7 @@
return ecode.DBErr
}
- err = model.NewServiceOrderSearch().SetId(v.Id).Updates(map[string]interface{}{
-
- })
+ err = model.NewServiceOrderSearch().SetId(v.Id).Updates(map[string]interface{}{})
if err != nil {
return ecode.DBErr
}
@@ -58,9 +56,9 @@
}
func (ServiceOrderService) UpdateServiceOrder(serviceOrder *model.ServiceOrder) int {
- err := model.NewServiceOrderSearch().Save(serviceOrder)
- if err != nil {
- return ecode.DBErr
- }
+ err := model.NewServiceOrderSearch().SetId(serviceOrder.Id).Save(serviceOrder)
+ if err != nil {
+ return ecode.DBErr
+ }
return ecode.OK
}
--
Gitblit v1.8.0