From 1109d0c6565e3413e54d9f28e68dda8ca26b99c4 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 25 七月 2023 11:19:52 +0800
Subject: [PATCH] fix
---
model/client.go | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/model/client.go b/model/client.go
index 931337c..c764ea9 100644
--- a/model/client.go
+++ b/model/client.go
@@ -12,9 +12,13 @@
Name string `json:"name" gorm:"column:name;unique;type:varchar(255);comment:瀹㈡埛鍚嶇О"`
Number string `json:"number" gorm:"column:number;type:varchar(255);comment:瀹㈡埛缂栧彿"`
ClientStatusId int `json:"client_status_id" gorm:"column:client_status_id;type:int(11);comment:瀹㈡埛鐘舵�両D"`
+ ClientStatus ClientStatus `json:"client_status" gorm:"foreignKey:ClientStatusId"`
ClientTypeId int `json:"client_type_id" gorm:"column:client_type_id;type:int(11);comment:瀹㈡埛绫诲瀷ID"`
+ ClientType ClientType `json:"client_type" gorm:"foreignKey:ClientTypeId"`
ClientOriginId int `json:"client_origin_id" gorm:"column:client_origin_id;type:int(11);comment:瀹㈡埛鏉ユ簮ID"`
+ ClientOrigin ClientOrigin `json:"client_origin" gorm:"foreignKey:ClientOriginId"`
ClientLevelId int `json:"client_level_id" gorm:"column:client_level_id;type:int(11);comment:瀹㈡埛绛夌骇ID"`
+ ClientLevel ClientLevel `json:"client_level" gorm:"foreignKey:ClientLevelId"`
Contacts []Contact `json:"contacts" gorm:"foreignKey:ClientId"`
MemberId int `json:"member_id" gorm:"column:member_id;type:int(11);comment:閿�鍞礋璐ｄ汉ID"`
ServiceMemberId int `json:"service_member_id" gorm:"column:service_member_id;type:int(11);comment:鏈嶅姟璐熻矗浜篒D"`
@@ -38,9 +42,13 @@
return "clients"
}
-func NewClientSearch() *ClientSearch {
+func NewClientSearch(db *gorm.DB) *ClientSearch {
+ if db == nil {
+ db = mysqlx.GetDB()
+ }
+
return &ClientSearch{
- Orm: mysqlx.GetDB(),
+ Orm: db,
}
}
@@ -63,7 +71,7 @@
func (slf *ClientSearch) Update(record *Client) error {
var db = slf.build()
- return db.Save(record).Error
+ return db.Updates(record).Error
}
func (slf *ClientSearch) Delete() error {
@@ -96,7 +104,7 @@
func (slf *ClientSearch) Find() ([]*Client, error) {
var db = slf.build()
var records = make([]*Client, 0)
- err := db.Preload("FollowRecord").Preload("EnterpriseNature").Preload("RegisteredCapital").Preload("Industry").Preload("EnterpriseScale").Preload("Contacts").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
+ err := db.Preload("ClientStatus").Preload("ClientType").Preload("ClientOrigin").Preload("ClientLevel").Preload("FollowRecord").Preload("EnterpriseNature").Preload("RegisteredCapital").Preload("Industry").Preload("EnterpriseScale").Preload("Contacts").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
return records, err
}
--
Gitblit v1.8.0