From 17aaed743ab7a3520ec8eb9e4ab7c776ca807cdd Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 12 十月 2023 20:43:16 +0800
Subject: [PATCH] bug修改
---
model/serviceFollowup.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/model/serviceFollowup.go b/model/serviceFollowup.go
index 3f457a6..c69cd23 100644
--- a/model/serviceFollowup.go
+++ b/model/serviceFollowup.go
@@ -41,7 +41,7 @@
ServiceFollowup
Orm *gorm.DB
KeywordType constvar.ServiceFollowupKeywordType
- Keyword interface{}
+ Keyword string
OrderBy string
PageNum int
PageSize int
@@ -79,6 +79,10 @@
case constvar.ServiceFollowupKeywordSatisfactionDegree:
db = db.Joins("Satisfaction").Where("Satisfaction.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
+ }
+
+ if slf.ServiceOrderId > 0 {
+ db = db.Where("service_order_id = ?", slf.ServiceOrderId)
}
if slf.Preload {
@@ -125,10 +129,6 @@
if err := db.Count(&total).Error; err != nil {
return records, total, err
}
- if slf.PageNum > 0 && slf.PageSize > 0 {
- db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
- }
-
if slf.PageNum > 0 && slf.PageSize > 0 {
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
--
Gitblit v1.8.0