From 981681b3cc96d3f8e90ce5e358e1540d02f9f5d9 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 19 十二月 2023 16:49:12 +0800
Subject: [PATCH] 错误判断

---
 model/client.go |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/model/client.go b/model/client.go
index 590c079..2f40162 100644
--- a/model/client.go
+++ b/model/client.go
@@ -117,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("clients.member_id != ?", constvar.UserTypeSuper)
-					} else {
-						db = db.Where("clients.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)
 				}
 
 			}
@@ -237,3 +241,11 @@
 	slf.Orm = slf.Orm.Where("id in (?)", ids)
 	return slf
 }
+
+func (slf *ClientSearch) FindAll() ([]*Client, error) {
+	var db = slf.build()
+	var records = make([]*Client, 0)
+
+	err := db.Find(&records).Error
+	return records, err
+}

--
Gitblit v1.8.0