feat:完善项目信息
This commit is contained in:
@ -25,7 +25,7 @@ type (
|
||||
}
|
||||
// InstanceBasicInfo 角色基本信息
|
||||
InstanceBasicInfo struct {
|
||||
ID uint64 `json:"id"`
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
)
|
||||
@ -77,12 +77,20 @@ func (c *Instance) Select() ([]*InstanceBasicInfo, error) {
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc),
|
||||
},
|
||||
}
|
||||
out := make([]*InstanceBasicInfo, 0)
|
||||
out := make([]*model2.SysRole, 0)
|
||||
|
||||
if err := model2.Scan(mSysRole.SysRole, &out, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
list := make([]*InstanceBasicInfo, 0)
|
||||
|
||||
for _, v := range out {
|
||||
list = append(list, &InstanceBasicInfo{
|
||||
ID: v.GetEncodeID(),
|
||||
Name: v.Name,
|
||||
})
|
||||
}
|
||||
return list, nil
|
||||
}
|
||||
|
||||
// Form 数据操作
|
||||
@ -152,11 +160,10 @@ func (c *Instance) Delete(id uint64) error {
|
||||
return err
|
||||
}
|
||||
go utils.TryCatch(func() {
|
||||
permission := service.NewPermission(
|
||||
if _, err = service.NewPermission(
|
||||
service.WithAuthTenant(fmt.Sprintf("%d", mSysRole.TenantID)),
|
||||
service.WithAuthRoles([]string{fmt.Sprintf("%d", id)}),
|
||||
)
|
||||
if _, err = permission.RemoveRolePolicy(); err != nil {
|
||||
).RemoveSingleRolePolicy(); err != nil {
|
||||
logger.ErrorF("Casbin 删除租户【%d】下角色【%d】权限信息错误:%v", mSysRole.TenantID, id, err)
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user