diff --git a/apis/system/role.go b/apis/system/role.go index 3187b2f..bc10dce 100644 --- a/apis/system/role.go +++ b/apis/system/role.go @@ -145,6 +145,6 @@ func DeleteRole(c *gin.Context) { IDS := tools.IdsStrToIdsIntGroup("roleId", c) _, err := Role.BatchDelete(IDS) - tools.HasError(err, "删除失败1", -1) + tools.HasError(err, "删除失败", -1) app.OK(c, "", "删除成功") } diff --git a/models/role.go b/models/role.go index 57703d9..2ea0915 100644 --- a/models/role.go +++ b/models/role.go @@ -191,6 +191,16 @@ func (role *SysRole) BatchDelete(id []int) (Result bool, err error) { return false, err } + var count int64 + if err := tx.Table("sys_user").Where("role_id in (?)", id).Count(&count).Error; err != nil { + tx.Rollback() + return false, err + } + if count > 0 { + tx.Rollback() + return false, errors.New("存在绑定用户,请解绑后重试") + } + // 删除角色 if err = tx.Table(role.TableName()).Where("role_id in (?)", id).Unscoped().Delete(&SysRole{}).Error; err != nil { tx.Rollback()