发布v2.8.4版本，更新内容请查看：https://github.com/bufanyun/hotgo/tree/v2.0/docs/guide-zh-CN/addon-version-upgrade.md

server/internal/logic/admin/post.go

@@ -8,12 +8,13 @@ package admin
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
+	"hotgo/internal/library/hgorm"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
-	"hotgo/utility/validate"
 )
 
 type sAdminPost struct{}
@@ -27,8 +28,8 @@ func init() {
 }
 
 // Delete 删除
-func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) (err error) {
-	exist, err := dao.AdminMemberPost.Ctx(ctx).Where("post_id", in.Id).One()
+func (s *sAdminPost) Delete(ctx context.Context, in *adminin.PostDeleteInp) (err error) {
+	exist, err := dao.AdminMemberPost.Ctx(ctx).Where(dao.AdminMemberPost.Columns().PostId, in.Id).One()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -38,44 +39,55 @@ func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) (err
 		return gerror.New("请先解除该岗位下所有已关联用户关联关系！")
 	}
 
-	_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Delete()
+	_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Delete()
+	return
+}
+
+// VerifyUnique 验证部门唯一属性
+func (s *sAdminPost) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
+	if in.Where == nil {
+		return
+	}
+
+	cols := dao.AdminPost.Columns()
+	msgMap := g.MapStrStr{
+		cols.Name: "岗位名称已存在，请换一个",
+		cols.Code: "岗位编码已存在，请换一个",
+	}
+
+	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.AdminPost, g.Map{k: v}, message, in.Id); err != nil {
+			return
+		}
+	}
 	return
 }
 
 // Edit 修改/新增
-func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err error) {
-	if in.Name == "" {
-		err = gerror.New("名称不能为空")
-		return
-	}
-	if in.Code == "" {
-		err = gerror.New("编码不能为空")
-		return
-	}
-
-	uniqueName, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
+func (s *sAdminPost) Edit(ctx context.Context, in *adminin.PostEditInp) (err error) {
+	// 验证唯一性
+	err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
+		Id: in.Id,
+		Where: g.Map{
+			dao.AdminPost.Columns().Name: in.Name,
+			dao.AdminPost.Columns().Code: in.Code,
+		},
+	})
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	if !uniqueName {
-		err = gerror.New("名称已存在")
-		return
-	}
-
-	uniqueCode, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	if !uniqueCode {
-		err = gerror.New("编码已存在")
 		return
 	}
 
 	// 修改
 	if in.Id > 0 {
-		_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data(in).Update()
+		_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Data(in).Update()
 		return
 	}
 
@@ -85,9 +97,9 @@ func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err erro
 }
 
 // MaxSort 最大排序
-func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (res *adminin.PostMaxSortModel, err error) {
+func (s *sAdminPost) MaxSort(ctx context.Context, in *adminin.PostMaxSortInp) (res *adminin.PostMaxSortModel, err error) {
 	if in.Id > 0 {
-		if err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
+		if err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).OrderDesc(dao.AdminPost.Columns().Sort).Scan(&res); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
 			return
 		}
@@ -96,119 +108,73 @@ func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (re
 	if res == nil {
 		res = new(adminin.PostMaxSortModel)
 	}
-	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
-	return
-}
-
-// NameUnique 菜单名称是否唯一
-func (s *sAdminPost) NameUnique(ctx context.Context, in adminin.PostNameUniqueInp) (res *adminin.PostNameUniqueModel, err error) {
-	isUnique, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-
-	res = new(adminin.PostNameUniqueModel)
-	res.IsUnique = isUnique
-	return
-}
-
-// CodeUnique 编码是否唯一
-func (s *sAdminPost) CodeUnique(ctx context.Context, in adminin.PostCodeUniqueInp) (res *adminin.PostCodeUniqueModel, err error) {
-	isUnique, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-
-	res = new(adminin.PostCodeUniqueModel)
-	res.IsUnique = isUnique
+	res.Sort = form.DefaultMaxSort(res.Sort)
 	return
 }
 
 // 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)
+func (s *sAdminPost) View(ctx context.Context, in *adminin.PostViewInp) (res *adminin.PostViewModel, err error) {
+	err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Scan(&res)
 	return
 }
 
 // List 获取列表
-func (s *sAdminPost) List(ctx context.Context, in adminin.PostListInp) (list []*adminin.PostListModel, totalCount int, err error) {
+func (s *sAdminPost) List(ctx context.Context, in *adminin.PostListInp) (list []*adminin.PostListModel, totalCount int, err error) {
 	mod := dao.AdminPost.Ctx(ctx)
+	cols := dao.AdminPost.Columns()
 
 	// 访问路径
 	if in.Name != "" {
-		mod = mod.WhereLike("name", "%"+in.Name+"%")
+		mod = mod.WhereLike(cols.Name, "%"+in.Name+"%")
 	}
 
 	// 模块
 	if in.Code != "" {
-		mod = mod.Where("code", in.Code)
+		mod = mod.Where(cols.Code, in.Code)
 	}
 
 	// 请求方式
 	if in.Status > 0 {
-		mod = mod.Where("status", in.Status)
+		mod = mod.Where(cols.Status, in.Status)
+	}
+
+	if len(in.CreatedAt) == 2 {
+		mod = mod.WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
 	}
 
 	totalCount, err = mod.Count()
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+		err = gerror.Wrap(err, "获取岗位列表失败！")
 		return
 	}
 
 	if totalCount == 0 {
-		return list, totalCount, nil
+		return
 	}
 
-	err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&list)
+	err = mod.Page(in.Page, in.PerPage).OrderAsc(cols.Sort).Scan(&list)
 	return
 }
 
 // GetMemberByStartName 获取指定用户的第一岗位
 func (s *sAdminPost) GetMemberByStartName(ctx context.Context, memberId int64) (name string, err error) {
 	// 默认取第一岗位
-	postId, err := dao.AdminMemberPost.Ctx(ctx).
-		Fields("post_id").
-		Where("member_id", memberId).
-		Limit(1).
-		Value()
+	postId, err := dao.AdminMemberPost.Ctx(ctx).Fields(dao.AdminMemberPost.Columns().PostId).Where(dao.AdminMemberPost.Columns().MemberId, memberId).Limit(1).Value()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
 
-	val, err := dao.AdminPost.Ctx(ctx).
-		Fields("name").
-		Where("id", postId.Int()).
-		Order("id desc").
-		Value()
+	val, err := dao.AdminPost.Ctx(ctx).Fields(dao.AdminPost.Columns().Name).WherePri(postId.Int()).OrderDesc(dao.AdminPost.Columns().Id).Value()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
-
 	return val.String(), nil
 }
 
 // Status 更新状态
-func (s *sAdminPost) Status(ctx context.Context, in adminin.PostStatusInp) (err error) {
-	if in.Id <= 0 {
-		err = gerror.New("ID不能为空")
-		return
-	}
-
-	if in.Status <= 0 {
-		err = gerror.New("状态不能为空")
-		return
-	}
-
-	if !validate.InSlice(consts.StatusSlice, in.Status) {
-		err = gerror.New("状态不正确")
-		return
-	}
-
-	// 修改
-	_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
+func (s *sAdminPost) Status(ctx context.Context, in *adminin.PostStatusInp) (err error) {
+	_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Data(dao.AdminPost.Columns().Status, in.Status).Update()
 	return
 }