From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
model/client.go | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/model/client.go b/model/client.go
index 28d4a52..dea1044 100644
--- a/model/client.go
+++ b/model/client.go
@@ -3,6 +3,7 @@
import (
"aps_crm/constvar"
"aps_crm/pkg/mysqlx"
+ "fmt"
"gorm.io/gorm"
"time"
)
@@ -70,6 +71,9 @@
if slf.Name != "" {
db.Where("name = ?", slf.Name)
}
+ if slf.Number != "" {
+ db.Where("number = ?", slf.Number)
+ }
if len(slf.SearchMap) > 0 {
for key, value := range slf.SearchMap {
@@ -98,7 +102,7 @@
// 鏌ヨ鍏捣瀹㈡埛
if key == "public_sea" {
- db = db.Where("member_id = ?", constvar.UserTypeSuper)
+ db = db.Where("clients.member_id = ?", constvar.UserTypeSuper)
}
if key == "client_status" {
@@ -113,17 +117,21 @@
db = db.Joins("Member").Where("Member.username LIKE ?", "%"+v+"%")
}
- case int, uint, int64, float64:
+ case int, uint, int64, float64, bool:
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)
- } else {
- db = db.Where("member_id = ?", constvar.UserTypeSuper)
+ if key == "is_public" {
+ if val, ok := v.(bool); ok {
+ if val {
+ db = db.Where("clients.member_id = ?", 0)
+ }
}
+ }
+ case []int:
+ if key == "member_ids" {
+ db = db.Where("clients.member_id in ?", v)
}
}
@@ -196,6 +204,30 @@
return db.Updates(data).Error
}
+func (slf *ClientSearch) Count() (int64, error) {
+ var db = slf.build()
+ var total int64
+ err := db.Count(&total).Error
+ return total, err
+}
+
+func (slf *ClientSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("MAX(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
+}
+
func (slf *ClientSearch) SetPage(page, size int) *ClientSearch {
slf.PageNum, slf.PageSize = page, size
return slf
--
Gitblit v1.8.0