发布v2.7.6版本

server/internal/logic/admin/cash.go

@@ -35,7 +35,7 @@ func init() {
 	service.RegisterAdminCash(NewAdminCash())
 }
 
-// View 获取指定字典类型信息
+// View 获取指定提现信息
 func (s *sAdminCash) View(ctx context.Context, in adminin.CashViewInp) (res *adminin.CashViewModel, err error) {
 	if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
 		err = gerror.New("没有访问权限")

server/internal/logic/admin/dept.go

@@ -68,7 +68,6 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 
 	// 修改
 	if in.Id > 0 {
-
 		// 获取父级tree
 		var pTree gdb.Value
 		pTree, err = dao.AdminDept.Ctx(ctx).Where("id", in.Pid).Fields("tree").Value()
@@ -87,7 +86,6 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 			// 如果当前部门有子级,更新子级tree关系树
 			return updateChildrenTree(ctx, in.Id, in.Level, in.Tree)
 		})
-
 		return
 	}
 
@@ -98,20 +96,18 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 
 func updateChildrenTree(ctx context.Context, _id int64, _level int, _tree string) (err error) {
 	var list []*entity.AdminDept
-	err = dao.AdminDept.Ctx(ctx).Where("pid", _id).Scan(&list)
-	if err != nil {
+	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.Id)
 
-		_, err = dao.AdminDept.Ctx(ctx).Where("id", child.Id).Data("level", child.Level, "tree", child.Tree).Update()
-		if err != nil {
-			return err
+		if _, err = dao.AdminDept.Ctx(ctx).Where("id", child.Id).Data("level", child.Level, "tree", child.Tree).Update(); err != nil {
+			return
 		}
-		err = updateChildrenTree(ctx, child.Id, child.Level, child.Tree)
-		if err != nil {
+
+		if err = updateChildrenTree(ctx, child.Id, child.Level, child.Tree); err != nil {
 			return
 		}
 	}
@@ -121,7 +117,7 @@ func updateChildrenTree(ctx context.Context, _id int64, _level int, _tree string
 // 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, consts.ErrorORM)
+		err = gerror.Wrap(err, "更新部门状态失败！")
 	}
 	return
 }
@@ -130,7 +126,7 @@ func (s *sAdminDept) Status(ctx context.Context, in adminin.DeptStatusInp) (err
 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 {
-			err = gerror.Wrap(err, consts.ErrorORM)
+			err = gerror.Wrap(err, "获取部门数据异常！")
 			return
 		}
 	}
@@ -143,9 +139,11 @@ func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (re
 	return
 }
 
-// View 获取指定字典类型信息
+// View 获取指定部门信息
 func (s *sAdminDept) View(ctx context.Context, in adminin.DeptViewInp) (res *adminin.DeptViewModel, err error) {
-	err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&res)
+	if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
+		err = gerror.Wrap(err, "获取部门信息失败！")
+	}
 	return
 }
 
@@ -165,17 +163,19 @@ func (s *sAdminDept) Option(ctx context.Context, in adminin.DeptOptionInp) (res
 
 	totalCount, err = mod.Count()
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+		err = gerror.Wrap(err, "获取部门数据行失败！")
 		return
 	}
 
 	if err = mod.Page(in.Page, in.PerPage).Order("sort asc,id asc").Scan(&models); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+		err = gerror.Wrap(err, "获取部门数据失败！")
 		return
 	}
 
 	res = new(adminin.DeptOptionModel)
-	res.List = s.treeList(pid, models)
+	if models != nil {
+		res.List = s.treeList(pid, models)
+	}
 	return
 }
 
@@ -190,42 +190,37 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adm
 
 	// 部门名称
 	if in.Name != "" {
-		values, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("name", "%"+in.Name+"%").Array()
+		columns, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("name", "%"+in.Name+"%").All()
 		if err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
+			err = gerror.Wrap(err, "过滤部门列表失败-1！")
 			return nil, err
 		}
-		for i := 0; i < len(values); i++ {
-			ids = append(ids, values[i].Int64())
-			pids = append(pids, values[i].Int64())
-		}
 
+		ds := g.NewVar(columns.Array()).Int64s()
+		ids = append(ids, ds...)
+		pids = append(pids, ds...)
 		if len(ids) == 0 {
 			return nil, nil
 		}
 	}
 
 	if in.Code != "" {
-		values, err := dao.AdminDept.Ctx(ctx).Fields("pid").
-			WhereLike("code", "%"+in.Code+"%").Array()
+		columns, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("code", "%"+in.Code+"%").All()
 		if err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
+			err = gerror.Wrap(err, "过滤部门列表失败-2！")
 			return nil, err
 		}
-		for i := 0; i < len(values); i++ {
-			ids = append(ids, values[i].Int64())
-			pids = append(pids, values[i].Int64())
-		}
 
+		ds := g.NewVar(columns.Array()).Int64s()
+		ids = append(ids, ds...)
+		pids = append(pids, ds...)
 		if len(ids) == 0 {
 			return nil, nil
 		}
 	}
 
 	if len(ids) > 0 {
-		ids = convert.UniqueSlice(ids)
-		pids = convert.UniqueSlice(pids)
-		mod = mod.Wheref(`id in (?) or pid in (?)`, ids, pids)
+		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 {
@@ -240,13 +235,16 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adm
 
 // GetName 获取部门名称
 func (s *sAdminDept) GetName(ctx context.Context, id int64) (name string, err error) {
-	var data entity.AdminDept
-	err = dao.AdminDept.Ctx(ctx).Where("id", id).Fields("name").Scan(&data)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return name, err
+	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
 }
 

server/internal/logic/admin/member.go

@@ -584,20 +584,17 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
 		return
 	}
 
-	for i := 0; i < len(list); i++ {
-		posts, err := dao.AdminMemberPost.Ctx(ctx).
+	for _, v := range list {
+		columns, err := dao.AdminMemberPost.Ctx(ctx).
 			Fields(dao.AdminMemberPost.Columns().PostId).
-			Where(dao.AdminMemberPost.Columns().MemberId, list[i].Id).
-			Array()
+			Where(dao.AdminMemberPost.Columns().MemberId, v.Id).All()
 
 		if err != nil {
 			err = gerror.Wrap(err, "获取用户岗位数据失败！")
 			return nil, 0, err
 		}
 
-		for _, v := range posts {
-			list[i].PostIds = append(list[i].PostIds, v.Int64())
-		}
+		v.PostIds = g.NewVar(columns.Array()).Int64s()
 	}
 	return
 }

server/internal/logic/admin/menu.go

@@ -8,18 +8,18 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"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"
-	"hotgo/api/admin/menu"
 	"hotgo/api/admin/role"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/casbin"
 	"hotgo/internal/library/contexts"
+	"hotgo/internal/library/hgorm"
 	"hotgo/internal/model/do"
 	"hotgo/internal/model/input/adminin"
-	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
 	"hotgo/utility/convert"
 	"hotgo/utility/tree"
@@ -35,40 +35,9 @@ func init() {
 	service.RegisterAdminMenu(NewAdminMenu())
 }
 
-// MaxSort 最大排序
-func (s *sAdminMenu) MaxSort(ctx context.Context, req *menu.MaxSortReq) (res *menu.MaxSortRes, err error) {
-	if req.Id > 0 {
-		if err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Order("sort desc").Scan(&res); err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
-			return nil, err
-		}
-	}
-
-	if res == nil {
-		res = new(menu.MaxSortRes)
-	}
-
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
-	return
-}
-
-// NameUnique 菜单名称是否唯一
-func (s *sAdminMenu) NameUnique(ctx context.Context, req *menu.NameUniqueReq) (res *menu.NameUniqueRes, err error) {
-	res = new(menu.NameUniqueRes)
-	res.IsUnique, err = dao.AdminMenu.IsUniqueName(ctx, req.Id, req.Name)
-	return
-}
-
-// CodeUnique 菜单编码是否唯一
-func (s *sAdminMenu) CodeUnique(ctx context.Context, req *menu.CodeUniqueReq) (res *menu.CodeUniqueRes, err error) {
-	res = new(menu.CodeUniqueRes)
-	res.IsUnique, err = dao.AdminMenu.IsUniqueName(ctx, req.Id, req.Code)
-	return
-}
-
 // Delete 删除
-func (s *sAdminMenu) Delete(ctx context.Context, req *menu.DeleteReq) (err error) {
-	exist, err := dao.AdminMenu.Ctx(ctx).Where("pid", req.Id).One()
+func (s *sAdminMenu) Delete(ctx context.Context, in adminin.MenuDeleteInp) (err error) {
+	exist, err := dao.AdminMenu.Ctx(ctx).Where("pid", in.Id).One()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -76,74 +45,76 @@ func (s *sAdminMenu) Delete(ctx context.Context, req *menu.DeleteReq) (err error
 	if !exist.IsEmpty() {
 		return gerror.New("请先删除该菜单下的所有菜单！")
 	}
-	_, err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Delete()
+	_, err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Delete()
+	return
+}
+
+// VerifyUnique 验证菜单唯一属性
+func (s *sAdminMenu) VerifyUnique(ctx context.Context, in adminin.VerifyUniqueInp) (err error) {
+	if in.Where == nil {
+		return
+	}
+
+	cols := dao.AdminMenu.Columns()
+	msgMap := g.MapStrStr{
+		cols.Name:  "菜单编码已存在，请换一个",
+		cols.Title: "菜单名称已存在，请换一个",
+	}
+
+	for k, v := range in.Where {
+		if v == "" {
+			continue
+		}
+		message, ok := msgMap[k]
+		if !ok {
+			err = gerror.Newf("字段 [ %v ] 未配置唯一属性验证", k)
+			return
+		}
+		if err = hgorm.IsUnique(ctx, &dao.AdminMenu, g.Map{k: v}, message, in.Id); err != nil {
+			return
+		}
+	}
 	return
 }
 
 // Edit 修改/新增
-func (s *sAdminMenu) Edit(ctx context.Context, req *menu.EditReq) (err error) {
-	var (
-		pidData    *do.AdminMenu
-		uniqueName bool
-		uniqueCode bool
-	)
-
-	if req.Title == "" {
-		err = gerror.New("菜单名称不能为空")
-		return err
-	}
-	if req.Type != 3 && req.Path == "" {
-		err = gerror.New("路由地址不能为空")
-		return err
-	}
-	if req.Name == "" {
-		err = gerror.New("路由名称不能为空")
-		return err
-	}
-
-	uniqueName, err = dao.AdminMenu.IsUniqueTitle(ctx, req.Id, req.Title)
+func (s *sAdminMenu) Edit(ctx context.Context, in adminin.MenuEditInp) (err error) {
+	// 验证唯一性
+	err = s.VerifyUnique(ctx, adminin.VerifyUniqueInp{
+		Where: g.Map{
+			dao.AdminMenu.Columns().Title: in.Title,
+			dao.AdminMenu.Columns().Name:  in.Name,
+		},
+	})
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
-	if !uniqueName {
-		err = gerror.New("菜单名称已存在")
-		return err
+		return
 	}
 
-	uniqueCode, err = dao.AdminMenu.IsUniqueName(ctx, req.Id, req.Name)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
-	}
-	if !uniqueCode {
-		err = gerror.New("菜单编码已存在")
-		return err
-	}
+	var pd *do.AdminMenu
 
 	// 维护菜单等级
-	if req.Pid == 0 {
-		req.Level = 1
+	if in.Pid == 0 {
+		in.Level = 1
 	} else {
-		if err = dao.AdminMenu.Ctx(ctx).Where("id", req.Pid).Scan(&pidData); err != nil {
+		if err = dao.AdminMenu.Ctx(ctx).Where("id", in.Pid).Scan(&pd); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
 			return err
 		}
-		if pidData == nil {
+		if pd == nil {
 			return gerror.New("上级菜单信息错误")
 		}
-		req.Level = gconv.Int(pidData.Level) + 1
+		in.Level = gconv.Int(pd.Level) + 1
 	}
 
 	// 修改
-	req.UpdatedAt = gtime.Now()
-	if req.Id > 0 {
-		if req.Pid == req.Id {
+	in.UpdatedAt = gtime.Now()
+	if in.Id > 0 {
+		if in.Pid == in.Id {
 			return gerror.New("上级菜单不能是当前菜单")
 		}
-		_, err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Data(req).Update()
-		if err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
+
+		if _, err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Data(in).Update(); err != nil {
+			err = gerror.Wrap(err, "修改菜单失败！")
 			return err
 		}
 
@@ -151,23 +122,17 @@ func (s *sAdminMenu) Edit(ctx context.Context, req *menu.EditReq) (err error) {
 	}
 
 	// 新增
-	req.CreatedAt = gtime.Now()
-	_, err = dao.AdminMenu.Ctx(ctx).Data(req).Insert()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+	in.CreatedAt = gtime.Now()
+
+	if _, err = dao.AdminMenu.Ctx(ctx).Data(in).Insert(); err != nil {
+		err = gerror.Wrap(err, "新增菜单失败！")
 		return err
 	}
 	return casbin.Refresh(ctx)
 }
 
-// View 获取信息
-func (s *sAdminMenu) View(ctx context.Context, req *menu.ViewReq) (res *menu.ViewRes, err error) {
-	err = dao.AdminMenu.Ctx(ctx).Where("id", req.Id).Scan(&res)
-	return
-}
-
 // List 获取菜单列表
-func (s *sAdminMenu) List(ctx context.Context, req *menu.ListReq) (lists []map[string]interface{}, err error) {
+func (s *sAdminMenu) List(ctx context.Context, in adminin.MenuListInp) (lists []map[string]interface{}, err error) {
 	var models []*adminin.MenuTree
 	err = dao.AdminMenu.Ctx(ctx).Order("sort asc,id desc").Scan(&models)
 	if err != nil {

server/internal/logic/admin/notice.go

@@ -322,19 +322,18 @@ func (s *sAdminNotice) UnreadCount(ctx context.Context, in adminin.NoticeUnreadC
 
 // messageIds 获取我的消息所有的消息ID
 func (s *sAdminNotice) messageIds(ctx context.Context, memberId int64) (ids []int64, err error) {
-	array, err := s.Model(ctx, &handler.Option{FilterAuth: false}).
+	columns, err := s.Model(ctx, &handler.Option{FilterAuth: false}).
 		Fields("id").
 		Where("status", consts.StatusEnabled).
 		Where("(`type` IN(?) OR (`type` = ? and JSON_CONTAINS(`receiver`,'"+gconv.String(memberId)+"')))",
 			[]int{consts.NoticeTypeNotify, consts.NoticeTypeNotice}, consts.NoticeTypeLetter,
-		).Array()
+		).All()
 	if err != nil {
+		err = gerror.Wrap(err, "获取我的消息失败！")
 		return
 	}
 
-	for _, v := range array {
-		ids = append(ids, v.Int64())
-	}
+	ids = g.NewVar(columns).Int64s()
 	return
 }
 

server/internal/logic/admin/post.go

@@ -126,7 +126,7 @@ func (s *sAdminPost) CodeUnique(ctx context.Context, in adminin.PostCodeUniqueIn
 	return
 }
 
-// View 获取指定字典类型信息
+// View 获取指定岗位信息
 func (s *sAdminPost) View(ctx context.Context, in adminin.PostViewInp) (res *adminin.PostViewModel, err error) {
 	err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Scan(&res)
 	return

server/internal/logic/admin/role.go

@@ -141,13 +141,10 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePer
 			return
 		}
 
-		if len(in.MenuIds) == 0 {
+		if in.MenuIds = convert.UniqueSlice(in.MenuIds); len(in.MenuIds) == 0 {
 			return
 		}
 
-		// 去重
-		in.MenuIds = convert.UniqueSlice(in.MenuIds)
-
 		list := make(g.List, 0, len(in.MenuIds))
 		for _, v := range in.MenuIds {
 			list = append(list, g.Map{
@@ -160,7 +157,6 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePer
 			err = gerror.Wrap(err, consts.ErrorORM)
 			return
 		}
-
 		return
 	})
 
@@ -217,20 +213,18 @@ func (s *sAdminRole) Edit(ctx context.Context, in adminin.RoleEditInp) (err erro
 
 func updateRoleChildrenTree(ctx context.Context, _id int64, _level int, _tree string) (err error) {
 	var list []*entity.AdminDept
-	err = dao.AdminRole.Ctx(ctx).Where("pid", _id).Scan(&list)
-	if err != nil {
+	if err = dao.AdminRole.Ctx(ctx).Where("pid", _id).Scan(&list); err != nil {
 		return
 	}
 	for _, child := range list {
 		child.Level = _level + 1
 		child.Tree = tree.GenLabel(_tree, child.Id)
 
-		_, err = dao.AdminRole.Ctx(ctx).Where("id", child.Id).Data("level", child.Level, "tree", child.Tree).Update()
-		if err != nil {
-			return err
+		if _, err = dao.AdminRole.Ctx(ctx).Where("id", child.Id).Data("level", child.Level, "tree", child.Tree).Update(); err != nil {
+			return
 		}
-		err = updateRoleChildrenTree(ctx, child.Id, child.Level, child.Tree)
-		if err != nil {
+
+		if err = updateRoleChildrenTree(ctx, child.Id, child.Level, child.Tree); err != nil {
 			return
 		}
 	}