1、泛型化参数,预留泛型约束,方便以后代码扩展的类型安全校验

2、升级goframe至v2.7.3
This commit is contained in:
apefuu
2024-09-19 19:33:00 +08:00
parent 2a87055b62
commit f18ce6384b
57 changed files with 221 additions and 220 deletions

View File

@@ -255,7 +255,7 @@ func (s *sAdminDept) GetName(ctx context.Context, id int64) (name string, err er
func (s *sAdminDept) VerifyDeptId(ctx context.Context, id int64) (err error) {
var (
pid int64 = 0
mb = contexts.GetUser(ctx)
mb = contexts.GetUser[any](ctx)
mod = dao.AdminDept.Ctx(ctx).Fields(dao.AdminDept.Columns().Id)
)
@@ -291,8 +291,8 @@ func (s *sAdminDept) Option(ctx context.Context, in *adminin.DeptOptionInp) (res
)
// 非超管只获取下级
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
pid = contexts.GetUser(ctx).DeptId
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId[any](ctx)) {
pid = contexts.GetUser[any](ctx).DeptId
mod = mod.WhereLike(dao.AdminDept.Columns().Tree, "%"+tree.GetIdLabel(pid)+"%")
}