调整其他操作对按钮权限产生的影响

piexlmax · piexlmax · commit a8caeb789dfa · 2022-02-24T10:52:29.000+08:00
diff --git a/server/service/system/sys_authority.go b/server/service/system/sys_authority.go
@@ -57,6 +57,23 @@ func (authorityService *AuthorityService) CopyAuthority(copyInfo response.SysAut
 	if err != nil {
 		return
 	}
+
+	var btns []system.SysAuthorityBtn
+
+	err = global.GVA_DB.Find(&btns, "authority_id = ?", copyInfo.OldAuthorityId).Error
+	if err != nil {
+		return
+	}
+	for i := range btns {
+		btns[i].AuthorityId = copyInfo.Authority.AuthorityId
+	}
+
+	err = global.GVA_DB.Create(&btns).Error
+
+	if err != nil {
+		return
+	}
+
 	paths := CasbinServiceApp.GetPolicyPathByAuthorityId(copyInfo.OldAuthorityId)
 	err = CasbinServiceApp.UpdateCasbin(copyInfo.Authority.AuthorityId, paths)
 	if err != nil {
@@ -113,6 +130,7 @@ func (authorityService *AuthorityService) DeleteAuthority(auth *system.SysAuthor
 		}
 	}
 	err = global.GVA_DB.Delete(&[]system.SysUseAuthority{}, "sys_authority_authority_id = ?", auth.AuthorityId).Error
+	err = global.GVA_DB.Delete(&[]system.SysAuthorityBtn{}, "authority_id = ?", auth.AuthorityId).Error
 	CasbinServiceApp.ClearCasbin(0, auth.AuthorityId)
 	return err
 }
diff --git a/server/service/system/sys_base_menu.go b/server/service/system/sys_base_menu.go
@@ -22,6 +22,8 @@ func (baseMenuService *BaseMenuService) DeleteBaseMenu(id float64) (err error) {
 		var menu system.SysBaseMenu
 		db := global.GVA_DB.Preload("SysAuthoritys").Where("id = ?", id).First(&menu).Delete(&menu)
 		err = global.GVA_DB.Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error
+		err = global.GVA_DB.Delete(&system.SysBaseMenuBtn{}, "sys_base_menu_id = ?", id).Error
+		err = global.GVA_DB.Delete(&system.SysAuthorityBtn{}, "sys_menu_id = ?", id).Error
 		if err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ func (baseMenuService *BaseMenuService) DeleteBaseMenu(id float64) (err error) {`
`22`	`22`	`var menu system.SysBaseMenu`
`23`	`23`	`db := global.GVA_DB.Preload("SysAuthoritys").Where("id = ?", id).First(&menu).Delete(&menu)`
`24`	`24`	`err = global.GVA_DB.Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error`
	`25`	`+ err = global.GVA_DB.Delete(&system.SysBaseMenuBtn{}, "sys_base_menu_id = ?", id).Error`
	`26`	`+ err = global.GVA_DB.Delete(&system.SysAuthorityBtn{}, "sys_menu_id = ?", id).Error`
`25`	`27`	`if err != nil {`
`26`	`28`	`return err`
`27`	`29`	`}`