From b0d1fe4e0acb0fa40c684069c0e9d77d7a65ace3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 15:53:53 +0800
Subject: [PATCH] fix
---
model/client.go | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/model/client.go b/model/client.go
index ffa5cc8..ca7509a 100644
--- a/model/client.go
+++ b/model/client.go
@@ -13,7 +13,7 @@
Name string `json:"name" gorm:"column:name;uniqueIndex:name_isDeleted_idx;type:varchar(255);comment:瀹㈡埛鍚嶇О"`
IsDeleted bool `json:"-" gorm:"column:is_deleted;uniqueIndex:name_isDeleted_idx;type:tinyint(1);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"`
+ ClientStatusId int `json:"client_status_id" gorm:"column:client_status_id;type:int(11);default:1;comment:瀹㈡埛鐘舵�両D"`
ClientStatus ClientStatus `json:"client_status" gorm:"foreignKey:ClientStatusId"`
ClientTypeId int `json:"client_type_id" gorm:"column:client_type_id;type:int(11);default:1;comment:瀹㈡埛绫诲瀷ID"`
ClientType ClientType `json:"client_type" gorm:"foreignKey:ClientTypeId"`
@@ -31,9 +31,10 @@
NextVisitTime *CustomTime `json:"next_visit_time" gorm:"column:next_visit_time;type:datetime;comment:涓嬫鍥炶鏃堕棿"`
LatestServiceTime *CustomTime `json:"latest_service_time" gorm:"column:latest_service_time;type:datetime;comment:鏈�鏅氭湇鍔℃椂闂�"`
FollowRecord []FollowRecord `json:"follow_record" gorm:"foreignKey:ClientId"`
+ CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
Address
Business
- gormModel
+ CrmModel
}
ClientSearch struct {
@@ -97,7 +98,7 @@
// 鏌ヨ鍏捣瀹㈡埛
if key == "public_sea" {
- db = db.Where("member_id = ?", constvar.UserTypeSuper)
+ db = db.Where("clients.member_id = ?", constvar.UserTypeSuper)
}
if key == "client_status" {
@@ -112,18 +113,16 @@
db = db.Joins("Member").Where("Member.username LIKE ?", "%"+v+"%")
}
- case int:
- case int64:
- case float64:
+ case int, uint, int64, float64:
if key == "id" || key == "client_type_id" || key == "client_status_id" || key == "member_id" {
db = db.Where(key+" = ?", v)
}
if key == "not_admin" {
if v == float64(constvar.NotAdminYes) {
- db = db.Where("member_id != ?", constvar.UserTypeSuper)
+ db = db.Where("clients.member_id != ?", constvar.UserTypeSuper)
} else {
- db = db.Where("member_id = ?", constvar.UserTypeSuper)
+ db = db.Where("clients.member_id = ?", constvar.UserTypeSuper)
}
}
--
Gitblit v1.8.0