From 7f8a45a749419c3da5b81c4683f0b8034f5280f3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 25 七月 2023 15:20:09 +0800
Subject: [PATCH] fix
---
service/user.go | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/service/user.go b/service/user.go
index 7edac32..3f40330 100644
--- a/service/user.go
+++ b/service/user.go
@@ -35,7 +35,7 @@
}
func (userService *UserService) ChangePassword(u *model.User, newPassword string) (userInter *model.User, errCode int) {
- user, err := model.NewUserSearch(nil).SetId(u.ID).First()
+ user, err := model.NewUserSearch(nil).SetId(u.UUID).First()
if err != nil {
return nil, ecode.UserNotExist
}
@@ -45,7 +45,7 @@
}
user.Password = encrypt.BcryptHash(newPassword)
- err = model.NewUserSearch(nil).SetId(u.ID).UpdateByMap(map[string]interface{}{
+ err = model.NewUserSearch(nil).SetId(u.UUID).UpdateByMap(map[string]interface{}{
"password": user.Password})
return user, ecode.OK
@@ -57,9 +57,7 @@
if err != nil {
return err
}
- if user.Ip != "" {
- return errors.New("璇ョ敤鎴峰凡閰嶇疆闆嗙兢锛屾棤娉曞垹闄�")
- }
+
if user.UserType != constvar.UserTypeSub {
return errors.New("璇ョ敤鎴烽潪瀛愯处鎴凤紝鏃犳硶鍒犻櫎")
}
@@ -73,7 +71,7 @@
}
func (userService *UserService) SetUserInfo(req model.User) error {
- return model.NewUserSearch(nil).SetId(req.ID).UpdateByMap(map[string]interface{}{
+ return model.NewUserSearch(nil).SetId(req.UUID).UpdateByMap(map[string]interface{}{
"nick_name": req.NickName,
"header_img": req.HeaderImg,
"phone": req.Phone,
@@ -91,3 +89,7 @@
"password": encrypt.BcryptHash("123456"),
})
}
+
+func (userService *UserService) GetUserList() (userList []*model.User, err error) {
+ return model.NewUserSearch(nil).FindAll()
+}
--
Gitblit v1.8.0