public/gin-vue-admin
1
0
Fork 0
mirror of https://github.com/flipped-aurora/gin-vue-admin.git synced 2026-09-21 12:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #942 #957

Browse Source 
* fix:#957
* fix:#942
This commit is contained in:
songzhibin97
2022-03-16 18:21:15 +08:00
committed by GitHub
parent c193eb155e
commit 97a3ca223f
8 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/service/system/sys_user.go
+8 -9
View File
@@ -46,10 +46,10 @@ func (userService *UserService) Login(u *system.SysUser) (err error, userInter *
var user system.SysUser
u.Password = utils.MD5V([]byte(u.Password))
err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).Preload("Authorities").Preload("Authority").First(&user).Error
if err == nil{
if err == nil {
var am system.SysMenu
ferr := global.GVA_DB.First(&am,"name = ? AND authority_id = ?",user.Authority.DefaultRouter,user.AuthorityId).Error
if errors.Is(ferr,gorm.ErrRecordNotFound) {
ferr := global.GVA_DB.First(&am, "name = ? AND authority_id = ?", user.Authority.DefaultRouter, user.AuthorityId).Error
if errors.Is(ferr, gorm.ErrRecordNotFound) {
user.Authority.DefaultRouter = "404"
}
}
@@ -156,9 +156,8 @@ func (userService *UserService) DeleteUser(id int) (err error) {
//@param: reqUser model.SysUser
//@return: err error, user model.SysUser
func (userService *UserService) SetUserInfo(reqUser system.SysUser) (err error, user system.SysUser) {
err = global.GVA_DB.Updates(&reqUser).Error
return err, reqUser
func (userService *UserService) SetUserInfo(req system.SysUser) error {
return global.GVA_DB.Updates(&req).Error
}
//@author: [piexlmax](https://github.com/piexlmax)
@@ -170,12 +169,12 @@ func (userService *UserService) SetUserInfo(reqUser system.SysUser) (err error,
func (userService *UserService) GetUserInfo(uuid uuid.UUID) (err error, user system.SysUser) {
var reqUser system.SysUser
err = global.GVA_DB.Preload("Authorities").Preload("Authority").First(&reqUser, "uuid = ?", uuid).Error
if err!=nil{
if err != nil {
return err, reqUser
}
var am system.SysMenu
ferr := global.GVA_DB.First(&am,"name = ? AND authority_id = ?",reqUser.Authority.DefaultRouter,reqUser.AuthorityId).Error
if errors.Is(ferr,gorm.ErrRecordNotFound) {
ferr := global.GVA_DB.First(&am, "name = ? AND authority_id = ?", reqUser.Authority.DefaultRouter, reqUser.AuthorityId).Error
if errors.Is(ferr, gorm.ErrRecordNotFound) {
reqUser.Authority.DefaultRouter = "404"
}
return err, reqUser