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

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

Browse Source 
# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go
This commit is contained in:
rainyan
2020-04-06 00:47:46 +08:00
parent 13c30d4c55 39f256b4b7
commit dc4ebc5851
28 changed files with 259 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/model/sys_authority.go
+1 -1
View File
@@ -43,7 +43,7 @@ func (a *SysAuthority) DeleteAuthority() (err error) {
if err != nil {
err = global.GVA_DB.Where("parent_id = ?", a.AuthorityId).Find(&SysAuthority{}).Error
if err != nil {
err = global.GVA_DB.Where("authority_id = ?", a.AuthorityId).First(a).Unscoped().Delete(a).Error
err = global.GVA_DB.Preload("SysBaseMenus").Where("authority_id = ?", a.AuthorityId).First(a).Unscoped().Delete(a).Association("SysBaseMenus").Delete(a.SysBaseMenus).Error
new(CasbinModel).ClearCasbin(0, a.AuthorityId)
} else {
err = errors.New("此角色存在子角色不允许删除")