From 250cbfa1ddcb3cf38e0d0505c1c7e282b940d25b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 13 十月 2023 10:30:05 +0800
Subject: [PATCH] admin user id 转crm user id

---
 model/serviceFollowup.go |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go
index 004bfc3..fc3b09d 100644
--- a/model/serviceFollowup.go
+++ b/model/serviceFollowup.go
@@ -33,8 +33,7 @@
 		OldMember      User         `json:"oldMember" gorm:"foreignKey:OldMemberId"`
 		Remark         string       `json:"remark" gorm:"column:remark;type:text;comment:澶囨敞"`
 		File           string       `json:"file" gorm:"column:file;type:varchar(255);comment:闄勪欢"`
-
-		gorm.Model `json:"-"`
+		CrmModel
 	}
 
 	ServiceFollowupSearch struct {
@@ -49,7 +48,7 @@
 	}
 )
 
-func (ServiceFollowup) TableName() string {
+func (*ServiceFollowup) TableName() string {
 	return "service_followup"
 }
 
@@ -82,16 +81,15 @@
 	}
 
 	if slf.Preload {
-		db = db.Preload("CustomerServiceSheet").
-			Preload("ServiceOrder").
-			Preload("Client").
+		db = db.Preload("Client").
 			Preload("Contact").
+			Preload("ServiceOrder").
+			Preload("Member").
 			Preload("Satisfaction").
 			Preload("TimelyRate").
 			Preload("SolveRate").
 			Preload("IsVisit").
-			Preload("OldMember").
-			Preload("Member")
+			Preload("OldMember")
 	}
 
 	return db
@@ -134,7 +132,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Find(&records).Error
+	err := db.Order("id desc").Find(&records).Error
 	return records, total, err
 }
 

--
Gitblit v1.8.0