发布v2.15.1版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

server/internal/logic/admin/credits_log.go

@@ -236,7 +236,7 @@ func (s *sAdminCreditsLog) Export(ctx context.Context, in *adminin.CreditsLogLis
 	}
 
 	var (
-		fileName  = "导出资产变动-" + gctx.CtxId(ctx) + ".xlsx"
+		fileName  = "导出资产变动-" + gctx.CtxId(ctx)
 		sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
 		exports   []adminin.CreditsLogExportModel
 	)

server/internal/logic/admin/dept.go

@@ -14,6 +14,7 @@ import (
 	"hotgo/internal/dao"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/hgorm"
+	"hotgo/internal/library/hgorm/handler"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
@@ -33,10 +34,15 @@ func init() {
 	service.RegisterAdminDept(NewAdminDept())
 }
 
+// Model 部门ORM模型
+func (s *sAdminDept) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
+	return handler.Model(dao.AdminDept.Ctx(ctx), option...)
+}
+
 // Delete 删除
 func (s *sAdminDept) Delete(ctx context.Context, in *adminin.DeptDeleteInp) (err error) {
 	var models *entity.AdminDept
-	if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
+	if err = s.Model(ctx).WherePri(in.Id).Scan(&models); err != nil {
 		return err
 	}
 
@@ -44,7 +50,7 @@ func (s *sAdminDept) Delete(ctx context.Context, in *adminin.DeptDeleteInp) (err
 		return gerror.New("数据不存在或已删除！")
 	}
 
-	pidExist, err := dao.AdminDept.Ctx(ctx).Where("pid", models.Id).One()
+	pidExist, err := s.Model(ctx).Where(dao.AdminDept.Columns().Pid, models.Id).One()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -53,7 +59,7 @@ func (s *sAdminDept) Delete(ctx context.Context, in *adminin.DeptDeleteInp) (err
 		return gerror.New("请先删除该部门下得所有子级！")
 	}
 
-	_, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Delete()
+	_, err = s.Model(ctx).WherePri(in.Id).Delete()
 	return
 }
 
@@ -87,75 +93,41 @@ func (s *sAdminDept) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueI
 
 // Edit 修改/新增
 func (s *sAdminDept) Edit(ctx context.Context, in *adminin.DeptEditInp) (err error) {
+	where := g.Map{
+		dao.AdminDept.Columns().Name: in.Name,
+		dao.AdminDept.Columns().Code: in.Code,
+	}
 	// 验证唯一性
-	err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
-		Id: in.Id,
-		Where: g.Map{
-			dao.AdminDept.Columns().Name: in.Name,
-			dao.AdminDept.Columns().Code: in.Code,
-		},
-	})
+	err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{Id: in.Id, Where: where})
 	if err != nil {
 		return
 	}
 
-	// 生成下级关系树
-	if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, &dao.AdminDept, in.Pid); err != nil {
-		return
-	}
-
-	// 修改
-	if in.Id > 0 {
-		err = dao.AdminDept.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
-			// 更新数据
-			_, err = dao.AdminDept.Ctx(ctx).Fields(adminin.DeptUpdateFields{}).WherePri(in.Id).Data(in).Update()
-			if err != nil {
-				return err
+	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
+		in.Pid, in.Level, in.Tree, err = hgorm.AutoUpdateTree(ctx, &dao.AdminDept, in.Id, in.Pid)
+		if err != nil {
+			return err
+		}
+		// 修改
+		if in.Id > 0 {
+			if _, err = s.Model(ctx).WherePri(in.Id).Data(in).Update(); err != nil {
+				err = gerror.Wrap(err, "修改部门管理失败，请稍后重试！")
 			}
-
-			// 如果当前部门有子级,更新子级tree关系树
-			return updateChildrenTree(ctx, in.Id, in.Level, in.Tree)
-		})
-		return
-	}
-
-	// 新增
-	_, err = dao.AdminDept.Ctx(ctx).Fields(adminin.DeptInsertFields{}).Data(in).Insert()
-	return
-}
-
-func updateChildrenTree(ctx context.Context, _id int64, _level int, _tree string) (err error) {
-	var list []*entity.AdminDept
-	if err = dao.AdminDept.Ctx(ctx).Where("pid", _id).Scan(&list); err != nil || list == nil {
-		return
-	}
-	for _, child := range list {
-		child.Level = _level + 1
-		child.Tree = tree.GenLabel(_tree, child.Pid)
-
-		if _, err = dao.AdminDept.Ctx(ctx).Where("id", child.Id).Data("level", child.Level, "tree", child.Tree).Update(); err != nil {
 			return
 		}
 
-		if err = updateChildrenTree(ctx, child.Id, child.Level, child.Tree); err != nil {
-			return
+		// 新增
+		if _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).Data(in).Insert(); err != nil {
+			err = gerror.Wrap(err, "新增部门管理失败，请稍后重试！")
 		}
-	}
-	return
-}
-
-// Status 更新部门状态
-func (s *sAdminDept) Status(ctx context.Context, in *adminin.DeptStatusInp) (err error) {
-	if _, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update(); err != nil {
-		err = gerror.Wrap(err, "更新部门状态失败！")
-	}
-	return
+		return
+	})
 }
 
 // MaxSort 最大排序
 func (s *sAdminDept) MaxSort(ctx context.Context, in *adminin.DeptMaxSortInp) (res *adminin.DeptMaxSortModel, err error) {
 	if in.Id > 0 {
-		if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
+		if err = dao.AdminDept.Ctx(ctx).WherePri(in.Id).OrderDesc(dao.AdminDept.Columns().Sort).Scan(&res); err != nil {
 			err = gerror.Wrap(err, "获取部门数据异常！")
 			return
 		}
@@ -171,13 +143,146 @@ func (s *sAdminDept) MaxSort(ctx context.Context, in *adminin.DeptMaxSortInp) (r
 
 // View 获取指定部门信息
 func (s *sAdminDept) View(ctx context.Context, in *adminin.DeptViewInp) (res *adminin.DeptViewModel, err error) {
-	if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
+	if err = dao.AdminDept.Ctx(ctx).WherePri(in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, "获取部门信息失败！")
 	}
 	return
 }
 
-// Option 选项
+// List 获取列表
+func (s *sAdminDept) List(ctx context.Context, in *adminin.DeptListInp) (res *adminin.DeptListModel, err error) {
+	res = new(adminin.DeptListModel)
+
+	var (
+		mod  = dao.AdminDept.Ctx(ctx)
+		cols = dao.AdminDept.Columns()
+	)
+
+	// 部门名称
+	if in.Name != "" {
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Id).WhereLike(cols.Name, "%"+in.Name+"%").Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询部门名称失败！")
+			return nil, err
+		}
+
+		if len(columns) == 0 {
+			return nil, nil
+		}
+		res.Ids = append(res.Ids, g.NewVar(columns).Int64s()...)
+	}
+
+	// 部门编码
+	if in.Code != "" {
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Id).WhereLike(cols.Code, "%"+in.Code+"%").Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询部门编码失败！")
+			return nil, err
+		}
+
+		if len(columns) == 0 {
+			return nil, nil
+		}
+		res.Ids = append(res.Ids, g.NewVar(columns).Int64s()...)
+	}
+
+	// 负责人
+	if in.Leader != "" {
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Id).Where(cols.Leader, in.Leader).Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询负责人失败！")
+			return nil, err
+		}
+
+		if len(columns) == 0 {
+			return nil, nil
+		}
+		res.Ids = append(res.Ids, g.NewVar(columns).Int64s()...)
+	}
+
+	// 创建时间
+	if len(in.CreatedAt) == 2 {
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Id).WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1]).Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询创建时间失败！")
+			return nil, err
+		}
+
+		if len(columns) == 0 {
+			return nil, nil
+		}
+		res.Ids = append(res.Ids, g.NewVar(columns).Int64s()...)
+	}
+
+	res.Ids = convert.UniqueSlice(res.Ids)
+	if len(res.Ids) > 0 {
+		// 找到匹配到的完整上级部门
+		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Tree).WhereIn(cols.Id, res.Ids).Array()
+		if err != nil {
+			err = gerror.Wrap(err, "查询部门失败，请稍后重试！")
+			return nil, err
+		}
+		var pids []int64
+		for _, tr := range g.NewVar(columns).Strings() {
+			pids = append(pids, tree.GetIds(tr)...)
+		}
+		mod = mod.WhereIn(cols.Id, append(res.Ids, convert.UniqueSlice(pids)...))
+	}
+
+	if err = mod.Order("pid asc,sort asc").Scan(&res.List); err != nil {
+		err = gerror.Wrap(err, "获取部门列表失败！")
+		return
+	}
+	return
+}
+
+// GetName 获取部门名称
+func (s *sAdminDept) GetName(ctx context.Context, id int64) (name string, err error) {
+	var data *entity.AdminDept
+	if err = dao.AdminDept.Ctx(ctx).Where("id", id).Fields("name").Scan(&data); err != nil {
+		err = gerror.Wrap(err, "获取部门名称失败！")
+		return
+	}
+
+	if data == nil {
+		err = gerror.Wrap(err, "部门不存在！")
+		return
+	}
+	return data.Name, nil
+}
+
+// VerifyDeptId 验证部门ID
+func (s *sAdminDept) VerifyDeptId(ctx context.Context, id int64) (err error) {
+	var (
+		pid int64 = 0
+		mb        = contexts.GetUser(ctx)
+		mod       = dao.AdminDept.Ctx(ctx).Fields(dao.AdminDept.Columns().Id)
+	)
+
+	if mb == nil {
+		err = gerror.New("用户信息获取失败！")
+		return
+	}
+
+	// 非超管只获取下级
+	if !service.AdminMember().VerifySuperId(ctx, mb.Id) {
+		pid = mb.DeptId
+		mod = mod.WhereNot(dao.AdminDept.Columns().Id, pid).WhereLike(dao.AdminDept.Columns().Tree, "%"+tree.GetIdLabel(pid)+"%")
+	}
+
+	columns, err := mod.Array()
+	if err != nil {
+		return err
+	}
+
+	if !validate.InSlice(g.NewVar(columns).Int64s(), id) {
+		err = gerror.New("部门ID是无效的")
+		return
+	}
+	return
+}
+
+// Option 获取当前登录用户可选的部门选项
 func (s *sAdminDept) Option(ctx context.Context, in *adminin.DeptOptionInp) (res *adminin.DeptOptionModel, totalCount int, err error) {
 	var (
 		mod    = dao.AdminDept.Ctx(ctx)
@@ -209,104 +314,6 @@ func (s *sAdminDept) Option(ctx context.Context, in *adminin.DeptOptionInp) (res
 	return
 }
 
-// List 获取列表
-func (s *sAdminDept) List(ctx context.Context, in *adminin.DeptListInp) (res *adminin.DeptListModel, err error) {
-	var (
-		mod    = dao.AdminDept.Ctx(ctx)
-		cols   = dao.AdminDept.Columns()
-		models []*entity.AdminDept
-		ids    []int64
-		pids   []int64
-	)
-
-	appends := func(columns []gdb.Value) {
-		ds := g.NewVar(columns).Int64s()
-		ids = append(ids, ds...)
-		pids = append(pids, ds...)
-	}
-
-	// 部门名称
-	if in.Name != "" {
-		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereLike(cols.Name, "%"+in.Name+"%").Array()
-		if err != nil {
-			err = gerror.Wrap(err, "查询部门名称失败！")
-			return nil, err
-		}
-
-		if len(columns) == 0 {
-			return nil, nil
-		}
-		appends(columns)
-	}
-
-	if in.Code != "" {
-		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereLike(cols.Code, "%"+in.Code+"%").Array()
-		if err != nil {
-			err = gerror.Wrap(err, "查询部门编码失败！")
-			return nil, err
-		}
-
-		if len(columns) == 0 {
-			return nil, nil
-		}
-		appends(columns)
-	}
-
-	if in.Leader != "" {
-		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).Where(cols.Leader, in.Leader).Array()
-		if err != nil {
-			err = gerror.Wrap(err, "查询负责人失败！")
-			return nil, err
-		}
-
-		if len(columns) == 0 {
-			return nil, nil
-		}
-		appends(columns)
-	}
-
-	if len(in.CreatedAt) == 2 {
-		columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1]).Array()
-		if err != nil {
-			err = gerror.Wrap(err, "查询创建时间失败！")
-			return nil, err
-		}
-
-		if len(columns) == 0 {
-			return nil, nil
-		}
-		appends(columns)
-	}
-
-	if len(ids) > 0 {
-		mod = mod.Wheref(`id in (?) or pid in (?)`, convert.UniqueSlice(ids), convert.UniqueSlice(pids))
-	}
-
-	if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
-		err = gerror.Wrap(err, "获取部门列表失败！")
-		return
-	}
-
-	res = new(adminin.DeptListModel)
-	res.List = s.treeList(0, models)
-	return
-}
-
-// GetName 获取部门名称
-func (s *sAdminDept) GetName(ctx context.Context, id int64) (name string, err error) {
-	var data *entity.AdminDept
-	if err = dao.AdminDept.Ctx(ctx).Where("id", id).Fields("name").Scan(&data); err != nil {
-		err = gerror.Wrap(err, "获取部门名称失败！")
-		return
-	}
-
-	if data == nil {
-		err = gerror.Wrap(err, "部门不存在！")
-		return
-	}
-	return data.Name, nil
-}
-
 // treeList 树状列表
 func (s *sAdminDept) treeList(pid int64, nodes []*entity.AdminDept) (list []*adminin.DeptTree) {
 	list = make([]*adminin.DeptTree, 0)
@@ -327,34 +334,16 @@ func (s *sAdminDept) treeList(pid int64, nodes []*entity.AdminDept) (list []*adm
 	return
 }
 
-// VerifyDeptId 验证部门ID
-func (s *sAdminDept) VerifyDeptId(ctx context.Context, id int64) (err error) {
-	var (
-		pid int64 = 0
-		mb        = contexts.GetUser(ctx)
-		mod       = dao.AdminDept.Ctx(ctx).Fields(dao.AdminDept.Columns().Id)
-	)
-
-	if mb == nil {
-		err = gerror.New("用户信息获取失败！")
+// TreeOption 获取部门关系树选项
+func (s *sAdminDept) TreeOption(ctx context.Context) (nodes []tree.Node, err error) {
+	var models []*adminin.DeptTreeOption
+	if err = s.Model(ctx).Fields(adminin.DeptTreeOption{}).OrderAsc(dao.AdminDept.Columns().Pid).OrderAsc(dao.AdminDept.Columns().Sort).OrderDesc(dao.AdminDept.Columns().Id).Scan(&models); err != nil {
+		err = gerror.Wrap(err, "获取部门关系树选项失败！")
 		return
 	}
-
-	// 非超管只获取下级
-	if !service.AdminMember().VerifySuperId(ctx, mb.Id) {
-		pid = mb.DeptId
-		mod = mod.WhereNot(dao.AdminDept.Columns().Id, pid).WhereLike(dao.AdminDept.Columns().Tree, "%"+tree.GetIdLabel(pid)+"%")
+	nodes = make([]tree.Node, len(models))
+	for i, v := range models {
+		nodes[i] = v
 	}
-
-	columns, err := mod.Array()
-	if err != nil {
-		return err
-	}
-
-	ids := g.NewVar(columns).Int64s()
-	if !validate.InSlice(ids, id) {
-		err = gerror.New("部门ID是无效的")
-		return
-	}
-	return
+	return tree.ListToTree(0, nodes)
 }

server/internal/logic/admin/member.go

@@ -8,6 +8,7 @@ package admin
 import (
 	"context"
 	"fmt"
+	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/crypto/gmd5"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/database/gredis"
@@ -719,6 +720,7 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
 	res.Mobile = gstr.HideStr(res.Mobile, 40, `*`)
 	res.Email = gstr.HideStr(res.Email, 40, `*`)
 	res.OpenId, _ = service.CommonWechat().GetOpenId(ctx)
+	res.DeptType = contexts.GetDeptType(ctx)
 	return
 }
 
@@ -772,6 +774,22 @@ func (s *sAdminMember) Select(ctx context.Context, in *adminin.MemberSelectInp)
 	return
 }
 
+// GetIdsByKeyword 根据关键词查找符合条件的用户ID
+func (s *sAdminMember) GetIdsByKeyword(ctx context.Context, ks string) (res []int64, err error) {
+	ks = gstr.Trim(ks)
+	if len(ks) == 0 {
+		return
+	}
+	array, err := dao.AdminMember.Ctx(ctx).Fields("id").
+		Where("`id` = ? or `real_name` = ? or `username` = ? or `mobile` = ?", ks, ks, ks, ks).
+		Array()
+	if err != nil {
+		err = gerror.Wrap(err, "根据关键词获取用户ID失败，请稍后重试！")
+	}
+	res = gvar.New(array).Int64s()
+	return
+}
+
 // VerifySuperId 验证是否为超管
 func (s *sAdminMember) VerifySuperId(ctx context.Context, verifyId int64) bool {
 	s.superAdmin.RLock()

server/internal/logic/admin/menu.go

@@ -19,6 +19,7 @@ import (
 	"hotgo/internal/library/casbin"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/hgorm"
+	"hotgo/internal/library/hgorm/handler"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/service"
@@ -36,6 +37,11 @@ func init() {
 	service.RegisterAdminMenu(NewAdminMenu())
 }
 
+// Model Orm模型
+func (s *sAdminMenu) Model(ctx context.Context, option ...*handler.Option) *gdb.Model {
+	return handler.Model(dao.AdminMenu.Ctx(ctx), option...)
+}
+
 // Delete 删除
 func (s *sAdminMenu) Delete(ctx context.Context, in *adminin.MenuDeleteInp) (err error) {
 	exist, err := dao.AdminMenu.Ctx(ctx).Where("pid", in.Id).One()
@@ -282,3 +288,17 @@ func (s *sAdminMenu) treeList(pid int64, nodes []*entity.AdminMenu) (list []*adm
 	}
 	return
 }
+
+// GetFastList 获取菜单列表
+func (s *sAdminMenu) GetFastList(ctx context.Context) (res map[int64]*entity.AdminMenu, err error) {
+	var models []*entity.AdminMenu
+	if err = dao.AdminMenu.Ctx(ctx).Scan(&models); err != nil {
+		return
+	}
+
+	res = make(map[int64]*entity.AdminMenu, len(models))
+	for _, v := range models {
+		res[v.Id] = v
+	}
+	return
+}

server/internal/logic/admin/order.go

@@ -317,7 +317,7 @@ func (s *sAdminOrder) Export(ctx context.Context, in *adminin.OrderListInp) (err
 	}
 
 	var (
-		fileName  = "导出充值订单-" + gctx.CtxId(ctx) + ".xlsx"
+		fileName  = "导出充值订单-" + gctx.CtxId(ctx)
 		sheetName = fmt.Sprintf("索引条件共%v行,共%v页,当前导出是第%v页,本页共%v行", totalCount, form.CalPageCount(totalCount, in.PerPage), in.Page, len(list))
 		exports   []adminin.OrderExportModel
 	)

server/internal/logic/admin/role.go

@@ -226,6 +226,10 @@ func (s *sAdminRole) Delete(ctx context.Context, in *adminin.RoleDeleteInp) (err
 		return gerror.New("数据不存在或已删除！")
 	}
 
+	if models.Key == consts.SuperRoleKey {
+		return gerror.New("超管角色禁止删除！")
+	}
+
 	has, err := dao.AdminRole.Ctx(ctx).Where("pid", models.Id).One()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)

server/internal/logic/admin/site.go

@@ -82,11 +82,6 @@ func (s *sAdminSite) Register(ctx context.Context, in *adminin.RegisterInp) (err
 		return
 	}
 
-	if len(config.PostIds) == 0 {
-		err = gerror.New("管理员未配置默认岗位")
-		return
-	}
-
 	// 验证唯一性
 	err = service.AdminMember().VerifyUnique(ctx, &adminin.VerifyUniqueInp{
 		Where: g.Map{
@@ -225,39 +220,18 @@ func (s *sAdminSite) MobileLogin(ctx context.Context, in *adminin.MobileLoginInp
 
 // handleLogin .
 func (s *sAdminSite) handleLogin(ctx context.Context, mb *entity.AdminMember) (res *adminin.LoginModel, err error) {
-	var ro *entity.AdminRole
-	if err = dao.AdminRole.Ctx(ctx).Fields("id,key,status").Where("id", mb.RoleId).Scan(&ro); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-
-	if ro == nil {
-		err = gerror.New("角色不存在")
-		return
-	}
-
-	if ro.Status != consts.StatusEnabled {
-		err = gerror.New("角色已被禁用")
-		return
-	}
-
-	var dept *entity.AdminDept
-	if err = dao.AdminDept.Ctx(ctx).Fields("id,status").Where("id", mb.DeptId).Scan(&dept); err != nil || dept == nil {
-		err = gerror.Wrap(err, "获取部门信息失败，请稍后重试！")
-		return
-	}
-
-	if dept.Status != consts.StatusEnabled {
-		err = gerror.New("部门已被禁用，如有疑问请联系管理员")
-		return
+	role, dept, err := s.getLoginRoleAndDept(ctx, mb.RoleId, mb.DeptId)
+	if err != nil {
+		return nil, err
 	}
 
 	user := &model.Identity{
 		Id:       mb.Id,
 		Pid:      mb.Pid,
-		DeptId:   mb.DeptId,
-		RoleId:   ro.Id,
-		RoleKey:  ro.Key,
+		DeptId:   dept.Id,
+		DeptType: dept.Type,
+		RoleId:   role.Id,
+		RoleKey:  role.Key,
 		Username: mb.Username,
 		RealName: mb.RealName,
 		Avatar:   mb.Avatar,
@@ -281,10 +255,48 @@ func (s *sAdminSite) handleLogin(ctx context.Context, mb *entity.AdminMember) (r
 	return
 }
 
+// getLoginRoleAndDept 获取登录的角色和部门信息
+func (s *sAdminSite) getLoginRoleAndDept(ctx context.Context, roleId, deptId int64) (role *entity.AdminRole, dept *entity.AdminDept, err error) {
+	if err = dao.AdminRole.Ctx(ctx).Fields("id,key,status").WherePri(roleId).Scan(&role); err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return
+	}
+
+	if role == nil {
+		err = gerror.New("角色不存在或已被删除")
+		return
+	}
+
+	if role.Status != consts.StatusEnabled {
+		err = gerror.New("角色已被禁用，如有疑问请联系管理员")
+		return
+	}
+
+	if err = dao.AdminDept.Ctx(ctx).Fields("id,type,status").WherePri(deptId).Scan(&dept); err != nil {
+		err = gerror.Wrap(err, "获取部门信息失败，请稍后重试！")
+		return
+	}
+
+	if dept == nil {
+		err = gerror.New("部门不存在或已被删除")
+		return
+	}
+
+	if dept.Status != consts.StatusEnabled {
+		err = gerror.New("部门已被禁用，如有疑问请联系管理员")
+		return
+	}
+	return
+}
+
 // BindUserContext 绑定用户上下文
 func (s *sAdminSite) BindUserContext(ctx context.Context, claims *model.Identity) (err error) {
+	//// 如果不想每次访问都重新加载用户信息，可以放开注释。但在本次登录未失效前，用户信息不会刷新
+	//contexts.SetUser(ctx, claims)
+	//return
+
 	var mb *entity.AdminMember
-	if err = dao.AdminMember.Ctx(ctx).Where("id", claims.Id).Scan(&mb); err != nil {
+	if err = dao.AdminMember.Ctx(ctx).WherePri(claims.Id).Scan(&mb); err != nil {
 		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 		return
 	}
@@ -299,32 +311,16 @@ func (s *sAdminSite) BindUserContext(ctx context.Context, claims *model.Identity
 		return
 	}
 
-	var role *entity.AdminRole
-	if err = dao.AdminRole.Ctx(ctx).Fields("id,key,status").Where("id", mb.RoleId).Scan(&role); err != nil || role == nil {
-		err = gerror.Wrap(err, "获取角色信息失败，请稍后重试！")
-		return
-	}
-
-	if role.Status != consts.StatusEnabled {
-		err = gerror.New("角色已被禁用，如有疑问请联系管理员")
-		return
-	}
-
-	var dept *entity.AdminDept
-	if err = dao.AdminDept.Ctx(ctx).Fields("id,status").Where("id", mb.DeptId).Scan(&dept); err != nil || dept == nil {
-		err = gerror.Wrap(err, "获取部门信息失败，请稍后重试！")
-		return
-	}
-
-	if dept.Status != consts.StatusEnabled {
-		err = gerror.New("部门已被禁用，如有疑问请联系管理员")
-		return
+	role, dept, err := s.getLoginRoleAndDept(ctx, mb.RoleId, mb.DeptId)
+	if err != nil {
+		return err
 	}
 
 	user := &model.Identity{
 		Id:       mb.Id,
 		Pid:      mb.Pid,
-		DeptId:   mb.DeptId,
+		DeptId:   dept.Id,
+		DeptType: dept.Type,
 		RoleId:   mb.RoleId,
 		RoleKey:  role.Key,
 		Username: mb.Username,