yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop view (#1137)

Browse Source 
* sys_initdb_mysql/pgsql.go: 优化流程, 创建database前,如果dbname为空直接返回

* 删除视图逻辑

* 摘除视图初始化逻辑

* 移除dialog废弃的title标签修改为header

* 解决部分浏览器登录后遮罩不消失的bug

* 修复角色菜单逻辑

* element 2.2.2=>2.2.5

* 修复插件模板

* 调整自动插件模板到插件功能下

* 切换角色切换至角色首页

Co-authored-by: Lyon.Nee <lyon.nee@outlook.com>
This commit is contained in:
奇淼（piexlmax
2022-06-23 22:30:15 +08:00
committed by GitHub
co-authored by Lyon.Nee
parent 8504e9bf74
commit 091f83ff59
14 changed files with 102 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/service/system/sys_user.go
+32 -6
View File
@@ -48,8 +48,21 @@ func (userService *UserService) Login(u *system.SysUser) (userInter *system.SysU
if ok := utils.BcryptCheck(u.Password, user.Password); !ok {
return nil, errors.New("密码错误")
}
var am system.SysMenu
ferr := global.GVA_DB.First(&am, "name = ? AND authority_id = ?", user.Authority.DefaultRouter, user.AuthorityId).Error
var SysAuthorityMenus []system.SysAuthorityMenu
err = global.GVA_DB.Where("sys_authority_authority_id = ?", user.AuthorityId).Find(&SysAuthorityMenus).Error
if err != nil {
return
}
var MenuIds []string
for i := range SysAuthorityMenus {
MenuIds = append(MenuIds, SysAuthorityMenus[i].MenuId)
}
var am system.SysBaseMenu
ferr := global.GVA_DB.First(&am, "name = ? and id in (?)", user.Authority.DefaultRouter, MenuIds).Error
if errors.Is(ferr, gorm.ErrRecordNotFound) {
user.Authority.DefaultRouter = "404"
}
@@ -125,10 +138,10 @@ func (userService *UserService) SetUserAuthorities(id uint, authorityIds []strin
if TxErr != nil {
return TxErr
}
useAuthority := []system.SysUseAuthority{}
var useAuthority []system.SysUseAuthority
for _, v := range authorityIds {
useAuthority = append(useAuthority, system.SysUseAuthority{
id, v,
SysUserId: id, SysAuthorityAuthorityId: v,
})
}
TxErr = tx.Create(&useAuthority).Error
@@ -182,8 +195,21 @@ func (userService *UserService) GetUserInfo(uuid uuid.UUID) (user system.SysUser
if err != nil {
return reqUser, err
}
var am system.SysMenu
ferr := global.GVA_DB.First(&am, "name = ? AND authority_id = ?", reqUser.Authority.DefaultRouter, reqUser.AuthorityId).Error
var SysAuthorityMenus []system.SysAuthorityMenu
err = global.GVA_DB.Where("sys_authority_authority_id = ?", reqUser.AuthorityId).Find(&SysAuthorityMenus).Error
if err != nil {
return
}
var MenuIds []string
for i := range SysAuthorityMenus {
MenuIds = append(MenuIds, SysAuthorityMenus[i].MenuId)
}
var am system.SysBaseMenu
ferr := global.GVA_DB.First(&am, "name = ? and id in (?)", reqUser.Authority.DefaultRouter, MenuIds).Error
if errors.Is(ferr, gorm.ErrRecordNotFound) {
reqUser.Authority.DefaultRouter = "404"
}