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

server/internal/logic/admin/cash.go

@@ -17,6 +17,7 @@ import (
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/contexts"
+	"hotgo/internal/library/hgorm/hook"
 	"hotgo/internal/library/location"
 	"hotgo/internal/model"
 	"hotgo/internal/model/entity"
@@ -80,6 +81,18 @@ func (s *sAdminCash) List(ctx context.Context, in *adminin.CashListInp) (list []
 		mod = mod.Where("member_id", in.MemberId)
 	}
 
+	// 用户筛选
+	if len(in.ComplexMemberId) == 2 && len(in.ComplexMemberId[0]) > 0 {
+		memberIds, err := service.AdminMember().GetComplexMemberIds(ctx, in.ComplexMemberId[0], in.ComplexMemberId[1])
+		if err != nil {
+			return nil, 0, err
+		}
+		if len(memberIds) == 0 {
+			return nil, 0, nil
+		}
+		mod = mod.WhereIn(dao.AdminOrder.Columns().MemberId, memberIds)
+	}
+
 	if len(in.CreatedAt) == 2 {
 		mod = mod.WhereBetween("created_at", gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
 	}
@@ -93,6 +106,9 @@ func (s *sAdminCash) List(ctx context.Context, in *adminin.CashListInp) (list []
 		mod = mod.Where("member_id", opMemberId)
 	}
 
+	// 申请人摘要信息
+	mod = mod.Hook(hook.MemberSummary)
+
 	totalCount, err = mod.Count()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -107,19 +123,6 @@ func (s *sAdminCash) List(ctx context.Context, in *adminin.CashListInp) (list []
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
-
-	for _, v := range list {
-		var member *entity.AdminMember
-		if err = dao.AdminMember.Ctx(ctx).Fields("real_name", "username").Where("id", v.MemberId).Scan(&member); err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
-			return list, totalCount, err
-		}
-
-		if member != nil {
-			v.MemberName = member.RealName
-			v.MemberUser = member.Username
-		}
-	}
 	return
 }
 

server/internal/logic/admin/credits_log.go

@@ -14,6 +14,7 @@ import (
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/hgorm/handler"
+	"hotgo/internal/library/hgorm/hook"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
@@ -174,6 +175,18 @@ func (s *sAdminCreditsLog) List(ctx context.Context, in *adminin.CreditsLogListI
 		mod = mod.Where(dao.AdminCreditsLog.Columns().MemberId, in.MemberId)
 	}
 
+	// 用户筛选
+	if len(in.ComplexMemberId) == 2 && len(in.ComplexMemberId[0]) > 0 {
+		memberIds, err := service.AdminMember().GetComplexMemberIds(ctx, in.ComplexMemberId[0], in.ComplexMemberId[1])
+		if err != nil {
+			return nil, 0, err
+		}
+		if len(memberIds) == 0 {
+			return nil, 0, nil
+		}
+		mod = mod.WhereIn(dao.AdminOrder.Columns().MemberId, memberIds)
+	}
+
 	// 查询应用id
 	if in.AppId != "" {
 		mod = mod.WhereLike(dao.AdminCreditsLog.Columns().AppId, in.AppId)
@@ -209,7 +222,10 @@ func (s *sAdminCreditsLog) List(ctx context.Context, in *adminin.CreditsLogListI
 		mod = mod.WhereBetween(dao.AdminCreditsLog.Columns().CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
 	}
 
-	totalCount, err = mod.Clone().Count(1)
+	// 操作人摘要信息
+	mod = mod.Hook(hook.MemberSummary)
+
+	totalCount, err = mod.Clone().Count()
 	if err != nil {
 		return
 	}

server/internal/logic/admin/member.go

@@ -16,6 +16,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/grand"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
@@ -28,6 +29,7 @@ import (
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/convert"
 	"hotgo/utility/tree"
 	"hotgo/utility/validate"
 	"sync"
@@ -764,6 +766,52 @@ func (s *sAdminMember) Select(ctx context.Context, in *adminin.MemberSelectInp)
 	return
 }
 
+// GetLowerIds 获取指定用户的所有下级ID集合
+func (s *sAdminMember) GetLowerIds(ctx context.Context, memberId int64) (ids []int64, err error) {
+	array, err := dao.AdminMember.Ctx(ctx).
+		Fields("id").
+		WhereLike("tree", "%"+tree.GenLabel("", memberId)+"%").
+		Array()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, v := range array {
+		ids = append(ids, v.Int64())
+	}
+	return
+}
+
+// GetComplexMemberIds 组合查找符合条件的用户ID
+func (s *sAdminMember) GetComplexMemberIds(ctx context.Context, memberIdx, opt string) (ids []int64, err error) {
+	memberId := gconv.Int64(memberIdx)
+	count, err := s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).WherePri(memberId).Count()
+	if err != nil {
+		return nil, err
+	}
+	if count == 0 {
+		return
+	}
+
+	switch opt {
+	case "1": // 仅查自己
+		ids = append(ids, memberId)
+	case "2": // 仅查下级
+		ids, err = s.GetLowerIds(ctx, memberId)
+		if err != nil {
+			return nil, err
+		}
+	default: // 查全部
+		ids, err = s.GetLowerIds(ctx, memberId)
+		if err != nil {
+			return nil, err
+		}
+		ids = append(ids, memberId)
+	}
+	ids = convert.UniqueSlice(ids)
+	return
+}
+
 // GetIdsByKeyword 根据关键词查找符合条件的用户ID
 func (s *sAdminMember) GetIdsByKeyword(ctx context.Context, ks string) (res []int64, err error) {
 	ks = gstr.Trim(ks)

server/internal/logic/admin/order.go

@@ -13,6 +13,7 @@ import (
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/hgorm"
 	"hotgo/internal/library/hgorm/handler"
+	"hotgo/internal/library/hgorm/hook"
 	"hotgo/internal/library/payment"
 	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/adminin"
@@ -276,11 +277,26 @@ func (s *sAdminOrder) List(ctx context.Context, in *adminin.OrderListInp) (list
 		mod = mod.Where(dao.AdminOrder.Columns().MemberId, in.MemberId)
 	}
 
+	// 下单用户筛选
+	if len(in.ComplexMemberId) == 2 && len(in.ComplexMemberId[0]) > 0 {
+		memberIds, err := service.AdminMember().GetComplexMemberIds(ctx, in.ComplexMemberId[0], in.ComplexMemberId[1])
+		if err != nil {
+			return nil, 0, err
+		}
+		if len(memberIds) == 0 {
+			return nil, 0, nil
+		}
+		mod = mod.WhereIn(dao.AdminOrder.Columns().MemberId, memberIds)
+	}
+
 	mod = mod.LeftJoin(hgorm.GenJoinOnRelation(
 		dao.AdminOrder.Table(), dao.AdminOrder.Columns().OrderSn, // 主表表名,关联条件
 		dao.PayLog.Table(), "payLog", dao.PayLog.Columns().OrderSn, // 关联表表名,别名,关联条件
 	)...)
 
+	// 操作人摘要信息
+	mod = mod.Hook(hook.MemberSummary)
+
 	totalCount, err = mod.Clone().Count(1)
 	if err != nil {
 		return

server/internal/logic/sys/log.go

@@ -357,6 +357,18 @@ func (s *sSysLog) List(ctx context.Context, in *sysin.LogListInp) (list []*sysin
 		mod = mod.Where("member_id", in.MemberId)
 	}
 
+	// 操作人筛选
+	if len(in.ComplexMemberId) == 2 && len(in.ComplexMemberId[0]) > 0 {
+		memberIds, err := service.AdminMember().GetComplexMemberIds(ctx, in.ComplexMemberId[0], in.ComplexMemberId[1])
+		if err != nil {
+			return nil, 0, err
+		}
+		if len(memberIds) == 0 {
+			return nil, 0, nil
+		}
+		mod = mod.WhereIn("member_id", memberIds)
+	}
+
 	// 访问IP
 	if in.Ip != "" {
 		mod = mod.Where("ip", in.Ip)