From ff3e203423f296965472d1f09347cda5cfe3a786 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 11:37:19 +0800
Subject: [PATCH] update
---
model/user.go | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/model/user.go b/model/user.go
index 69cfc0c..69fc4fa 100644
--- a/model/user.go
+++ b/model/user.go
@@ -10,7 +10,8 @@
type (
// User token閲岃竟鎶婄敤鎴稩D銆佺埗鐢ㄦ埛ID銆佽鑹查兘甯︿笂
User struct {
- ID string `json:"id" gorm:"primaryKey;type:varchar(255);comment:鐢ㄦ埛ID"`
+ ID int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ UUID string `json:"uuid" gorm:"primaryKey;type:varchar(255);comment:鐢ㄦ埛ID"`
Username string `json:"username" gorm:"index;type:varchar(255);comment:鐢ㄦ埛鐧诲綍鍚�"`
UserType constvar.UserType `json:"userType" gorm:"type:int(11);comment:鐢ㄦ埛绫诲瀷 1瓒呯骇绠＄悊鍛� 2涓昏处鎴� 3瀛愯处鎴�"`
Password string `json:"-" gorm:"type:varchar(255);comment:鐢ㄦ埛鐧诲綍瀵嗙爜"`
@@ -65,7 +66,12 @@
}
func (slf *UserSearch) SetId(id string) *UserSearch {
- slf.ID = id
+ slf.UUID = id
+ return slf
+}
+
+func (slf *UserSearch) SetUserId(userId int) *UserSearch {
+ slf.ID = userId
return slf
}
@@ -82,8 +88,8 @@
func (slf *UserSearch) build() *gorm.DB {
var db = slf.Orm.Model(&User{}).Preload("Menus")
- if slf.ID != "" {
- db = db.Where("id = ?", slf.ID)
+ if slf.UUID != "" {
+ db = db.Where("id = ?", slf.UUID)
}
if slf.Username != "" {
@@ -257,3 +263,16 @@
func (slf *UserSearch) ReplaceMenu(user *User, menus []*Menu) error {
return slf.Orm.Model(user).Association("Menus").Replace(menus)
}
+
+func (slf *UserSearch) FindAll() ([]*User, error) {
+ var (
+ records = make([]*User, 0)
+ db = slf.build()
+ )
+
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find all err: %v", err)
+ }
+
+ return records, nil
+}
--
Gitblit v1.8.0