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/contact.go |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/model/contact.go b/model/contact.go
index a955791..01c2732 100644
--- a/model/contact.go
+++ b/model/contact.go
@@ -15,6 +15,7 @@
 		Position string      `json:"position" gorm:"column:position;type:varchar(255);comment:鑱屼綅"`
 		Phone    string      `json:"phone" gorm:"column:phone;type:varchar(255);comment:鐢佃瘽"`
 		MemberId int         `json:"member_id" gorm:"column:member_id;type:int(11);comment:璐熻矗浜篒D"`
+		Member   User        `json:"member" gorm:"foreignKey:MemberId"`
 		IsFirst  bool        `json:"is_first" gorm:"column:is_first;type:tinyint(1);comment:鏄惁棣栬鑱旂郴浜�"`
 		Wechat   string      `json:"wechat" gorm:"column:wechat;type:varchar(255);comment:寰俊"`
 		Birthday *CustomTime `json:"birthday" gorm:"column:birthday;type:datetime;comment:鐢熸棩"`
@@ -92,8 +93,10 @@
 					}
 				}
 			case int:
+			case int64:
+			case float64:
 				if key == "client_id" {
-					db = db.Where("client_id = ?", v)
+					db = db.Where("client_id = ? and is_first = true", v)
 				}
 			}
 		}
@@ -152,7 +155,7 @@
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
 
-	err := db.Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Find(&records).Error
+	err := db.Preload("Member").Preload("FollowRecord").Preload("Client").Preload("Country").Preload("Province").Preload("City").Preload("Region").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 

--
Gitblit v1.8.0