修复树表上级关系绑定验证，优化CURD代码生成

server/internal/logic/admin/dept.go

@@ -9,7 +9,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/frame/g"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/contexts"
@@ -20,7 +20,6 @@ import (
 	"hotgo/internal/service"
 	"hotgo/utility/convert"
 	"hotgo/utility/tree"
-	"hotgo/utility/validate"
 )
 
 type sAdminDept struct{}
@@ -33,18 +32,6 @@ func init() {
 	service.RegisterAdminDept(NewAdminDept())
 }
 
-// NameUnique 菜单名称是否唯一
-func (s *sAdminDept) NameUnique(ctx context.Context, in adminin.DeptNameUniqueInp) (res *adminin.DeptNameUniqueModel, err error) {
-	isUnique, err := dao.AdminDept.IsUniqueName(ctx, in.Id, in.Name)
-	if err != nil {
-		return
-	}
-
-	res = new(adminin.DeptNameUniqueModel)
-	res.IsUnique = isUnique
-	return
-}
-
 // Delete 删除
 func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err error) {
 	var models *entity.AdminDept
@@ -71,18 +58,7 @@ func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err
 
 // Edit 修改/新增
 func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err error) {
-	if in.Name == "" {
-		err = gerror.New("名称不能为空")
-		return
-	}
-
-	uniqueName, err := dao.AdminDept.IsUniqueName(ctx, in.Id, in.Name)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	if !uniqueName {
-		err = gerror.New("名称已存在")
+	if err = hgorm.IsUnique(ctx, dao.AdminDept, g.Map{dao.AdminDept.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil {
 		return
 	}
 
@@ -103,7 +79,7 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 
 		err = dao.AdminDept.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 			// 更新数据
-			_, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data(in).Update()
+			_, err = dao.AdminDept.Ctx(ctx).Fields(adminin.DeptUpdateFields{}).WherePri(in.Id).Data(in).Update()
 			if err != nil {
 				return err
 			}
@@ -116,7 +92,7 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 	}
 
 	// 新增
-	_, err = dao.AdminDept.Ctx(ctx).Data(in).Insert()
+	_, err = dao.AdminDept.Ctx(ctx).Fields(adminin.DeptInsertFields{}).Data(in).Insert()
 	return
 }
 
@@ -144,24 +120,9 @@ 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 in.Id <= 0 {
-		err = gerror.New("ID不能为空")
-		return
+	if _, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update(); err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
 	}
-
-	if in.Status <= 0 {
-		err = gerror.New("状态不能为空")
-		return
-	}
-
-	if !validate.InSliceInt(consts.StatusSlice, in.Status) {
-		err = gerror.New("状态不正确")
-		return
-	}
-
-	// 修改
-	in.UpdatedAt = gtime.Now()
-	_, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
 	return
 }
 
@@ -177,6 +138,7 @@ func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (re
 	if res == nil {
 		res = new(adminin.DeptMaxSortModel)
 	}
+
 	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
 	return
 }

server/internal/logic/admin/member.go

@@ -47,17 +47,17 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
 		memberId = contexts.GetUserId(ctx)
 	)
 
-	if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+		return
 	}
 
 	if mb == nil {
 		err = gerror.New("用户信息不存在")
-		return err
+		return
 	}
 
-	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
+	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		// 更新我的余额
 		_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
 			MemberId:    memberId,
@@ -68,7 +68,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
 			Remark:      fmt.Sprintf("为后台用户:%v 操作%v", mb.Id, in.Remark),
 		})
 		if err != nil {
-			return err
+			return
 		}
 
 		// 更新对方余额
@@ -82,8 +82,6 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
 		})
 		return
 	})
-
-	return
 }
 
 // AddIntegral 增加积分
@@ -93,17 +91,17 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
 		memberId = contexts.GetUserId(ctx)
 	)
 
-	if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+		return
 	}
 
 	if mb == nil {
 		err = gerror.New("用户信息不存在")
-		return err
+		return
 	}
 
-	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
+	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		// 更新我的余额
 		_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
 			MemberId:    memberId,
@@ -114,7 +112,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
 			Remark:      fmt.Sprintf("为后台用户:%v 操作%v", mb.Id, in.Remark),
 		})
 		if err != nil {
-			return err
+			return
 		}
 
 		// 更新对方余额
@@ -128,8 +126,6 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
 		})
 		return
 	})
-
-	return
 }
 
 // UpdateCash 修改提现信息
@@ -140,19 +136,18 @@ func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCa
 		return
 	}
 
-	var memberInfo entity.AdminMember
-	if err = dao.AdminMember.Ctx(ctx).Where("id", memberId).Scan(&memberInfo); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+	var mb entity.AdminMember
+	if err = dao.AdminMember.Ctx(ctx).WherePri(memberId).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 		return
 	}
 
-	if gmd5.MustEncryptString(in.Password+memberInfo.Salt) != memberInfo.PasswordHash {
+	if gmd5.MustEncryptString(in.Password+mb.Salt) != mb.PasswordHash {
 		err = gerror.New("登录密码不正确")
 		return
 	}
 
-	_, err = dao.AdminMember.Ctx(ctx).
-		Where("id", memberId).
+	_, err = dao.AdminMember.Ctx(ctx).WherePri(memberId).
 		Data(g.Map{
 			dao.AdminMember.Columns().Cash: adminin.MemberCash{
 				Name:      in.Name,
@@ -162,6 +157,10 @@ func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCa
 		}).
 		Update()
 
+	if err != nil {
+		err = gerror.New("修改提现信息失败！")
+		return
+	}
 	return
 }
 
@@ -170,21 +169,21 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateE
 	memberId := contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
-		return err
+		return
 	}
 
-	var memberInfo *entity.AdminMember
-	if err = dao.AdminMember.Ctx(ctx).Where("id", memberId).Scan(&memberInfo); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	var mb *entity.AdminMember
+	if err = dao.AdminMember.Ctx(ctx).WherePri(memberId).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+		return
 	}
 
-	if memberInfo == nil {
+	if mb == nil {
 		err = gerror.New("用户信息不存在")
-		return err
+		return
 	}
 
-	if memberInfo.Email == in.Email {
+	if mb.Email == in.Email {
 		err = gerror.New("新旧邮箱不能一样")
 		return
 	}
@@ -195,14 +194,14 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateE
 	}
 
 	// 存在原绑定号码，需要进行验证
-	if memberInfo.Email != "" {
+	if mb.Email != "" {
 		err = service.SysEmsLog().VerifyCode(ctx, sysin.VerifyEmsCodeInp{
 			Event: consts.EmsTemplateBind,
-			Email: memberInfo.Email,
+			Email: mb.Email,
 			Code:  in.Code,
 		})
 		if err != nil {
-			return err
+			return
 		}
 	}
 
@@ -210,12 +209,10 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateE
 		dao.AdminMember.Columns().Email: in.Email,
 	}
 
-	_, err = dao.AdminMember.Ctx(ctx).Where("id", memberId).Data(update).Update()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if _, err = dao.AdminMember.Ctx(ctx).WherePri(memberId).Data(update).Update(); err != nil {
+		err = gerror.Wrap(err, "换绑邮箱失败，请稍后重试！")
+		return
 	}
-
 	return
 }
 
@@ -224,18 +221,18 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdate
 	memberId := contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
-		return err
+		return
 	}
 
 	var mb *entity.AdminMember
-	if err = dao.AdminMember.Ctx(ctx).Where("id", memberId).Scan(&mb); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if err = dao.AdminMember.Ctx(ctx).WherePri(memberId).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+		return
 	}
 
 	if mb == nil {
 		err = gerror.New("用户信息不存在")
-		return err
+		return
 	}
 
 	if mb.Mobile == in.Mobile {
@@ -256,7 +253,7 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdate
 			Code:   in.Code,
 		})
 		if err != nil {
-			return err
+			return
 		}
 	}
 
@@ -264,11 +261,10 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdate
 		dao.AdminMember.Columns().Mobile: in.Mobile,
 	}
 
-	if _, err = dao.AdminMember.Ctx(ctx).Where("id", memberId).Data(update).Update(); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if _, err = dao.AdminMember.Ctx(ctx).WherePri(memberId).Data(update).Update(); err != nil {
+		err = gerror.Wrap(err, "换绑手机号失败，请稍后重试！")
+		return
 	}
-
 	return
 }
 
@@ -277,63 +273,59 @@ func (s *sAdminMember) UpdateProfile(ctx context.Context, in adminin.MemberUpdat
 	memberId := contexts.Get(ctx).User.Id
 	if memberId <= 0 {
 		err = gerror.New("获取用户信息失败！")
-		return err
+		return
 	}
 
 	var mb *entity.AdminMember
-	if err = dao.AdminMember.Ctx(ctx).Where("id", memberId).Scan(&mb); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if err = dao.AdminMember.Ctx(ctx).WherePri(memberId).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+		return
 	}
 
 	if mb == nil {
 		err = gerror.New("用户信息不存在")
-		return err
+		return
 	}
 
+	cols := dao.AdminMember.Columns()
 	update := g.Map{
-		dao.AdminMember.Columns().Avatar:   in.Avatar,
-		dao.AdminMember.Columns().RealName: in.RealName,
-		dao.AdminMember.Columns().Qq:       in.Qq,
-		dao.AdminMember.Columns().Birthday: in.Birthday,
-		dao.AdminMember.Columns().Sex:      in.Sex,
-		dao.AdminMember.Columns().CityId:   in.CityId,
-		dao.AdminMember.Columns().Address:  in.Address,
+		cols.Avatar:   in.Avatar,
+		cols.RealName: in.RealName,
+		cols.Qq:       in.Qq,
+		cols.Birthday: in.Birthday,
+		cols.Sex:      in.Sex,
+		cols.CityId:   in.CityId,
+		cols.Address:  in.Address,
 	}
 
-	if _, err = dao.AdminMember.Ctx(ctx).Where("id", memberId).Data(update).Update(); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if _, err = dao.AdminMember.Ctx(ctx).WherePri(memberId).Data(update).Update(); err != nil {
+		err = gerror.Wrap(err, "更新资料失败，请稍后重试！")
+		return
 	}
-
 	return
 }
 
 // UpdatePwd 修改登录密码
 func (s *sAdminMember) UpdatePwd(ctx context.Context, in adminin.MemberUpdatePwdInp) (err error) {
 	var mb entity.AdminMember
-	if err = dao.AdminMember.Ctx(ctx).Where("id", in.Id).Scan(&mb); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	if err = dao.AdminMember.Ctx(ctx).WherePri(in.Id).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+		return
 	}
 
 	if gmd5.MustEncryptString(in.OldPassword+mb.Salt) != mb.PasswordHash {
 		err = gerror.New("原密码不正确")
-		return err
+		return
 	}
 
-	_, err = dao.AdminMember.Ctx(ctx).
-		Where("id", in.Id).
-		Data(g.Map{
-			dao.AdminMember.Columns().PasswordHash: gmd5.MustEncryptString(in.NewPassword + mb.Salt),
-		}).
-		Update()
-
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+	update := g.Map{
+		dao.AdminMember.Columns().PasswordHash: gmd5.MustEncryptString(in.NewPassword + mb.Salt),
 	}
 
+	if _, err = dao.AdminMember.Ctx(ctx).WherePri(in.Id).Data(update).Update(); err != nil {
+		err = gerror.Wrap(err, "更新登录密码失败，请稍后重试！")
+		return
+	}
 	return
 }
 
@@ -344,8 +336,8 @@ func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdIn
 		memberId = contexts.GetUserId(ctx)
 	)
 
-	if err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Scan(&mb); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&mb); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 		return
 	}
 
@@ -354,12 +346,14 @@ func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdIn
 		return
 	}
 
-	_, err = s.FilterAuthModel(ctx, memberId).
-		Where("id", in.Id).
-		Data(g.Map{
-			dao.AdminMember.Columns().PasswordHash: gmd5.MustEncryptString(in.Password + mb.Salt),
-		}).
-		Update()
+	update := g.Map{
+		dao.AdminMember.Columns().PasswordHash: gmd5.MustEncryptString(in.Password + mb.Salt),
+	}
+
+	if _, err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Data(update).Update(); err != nil {
+		err = gerror.Wrap(err, "用户密码重置失败，请稍后重试！")
+		return
+	}
 	return
 }
 
@@ -369,11 +363,12 @@ func (s *sAdminMember) VerifyUnique(ctx context.Context, in adminin.VerifyUnique
 		return
 	}
 
+	cols := dao.AdminMember.Columns()
 	msgMap := g.MapStrStr{
-		"username":    "用户名已存在，请换一个",
-		"email":       "邮箱已存在，请换一个",
-		"mobile":      "手机号已存在，请换一个",
-		"invite_code": "邀请码已存在，请换一个",
+		cols.Username:   "用户名已存在，请换一个",
+		cols.Email:      "邮箱已存在，请换一个",
+		cols.Mobile:     "手机号已存在，请换一个",
+		cols.InviteCode: "邀请码已存在，请换一个",
 	}
 
 	for k, v := range in.Where {
@@ -389,7 +384,6 @@ func (s *sAdminMember) VerifyUnique(ctx context.Context, in adminin.VerifyUnique
 			return
 		}
 	}
-
 	return
 }
 
@@ -406,8 +400,28 @@ func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) (
 		return
 	}
 
-	_, err = s.FilterAuthModel(ctx, memberId).Where("id", in.Id).Delete()
-	return
+	var models *entity.AdminMember
+	if err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Scan(&models); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+		return
+	}
+
+	if models == nil {
+		err = gerror.New("需要删除的用户不存在或已删除！")
+		return
+	}
+
+	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
+		if _, err = s.FilterAuthModel(ctx, memberId).WherePri(in.Id).Delete(); err != nil {
+			err = gerror.Wrap(err, "删除用户失败，请稍后重试！")
+			return
+		}
+
+		if _, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", memberId).Delete(); err != nil {
+			err = gerror.Wrap(err, "删除用户岗位失败，请稍后重试！")
+		}
+		return
+	})
 }
 
 // Edit 修改/新增
@@ -423,12 +437,13 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
 		return
 	}
 
+	cols := dao.AdminMember.Columns()
 	err = s.VerifyUnique(ctx, adminin.VerifyUniqueInp{
 		Id: in.Id,
 		Where: g.Map{
-			dao.AdminMember.Columns().Username: in.Username,
-			dao.AdminMember.Columns().Mobile:   in.Mobile,
-			dao.AdminMember.Columns().Email:    in.Email,
+			cols.Username: in.Username,
+			cols.Mobile:   in.Mobile,
+			cols.Email:    in.Email,
 		},
 	})
 	if err != nil {
@@ -450,28 +465,30 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
 		mod := s.FilterAuthModel(ctx, opMemberId)
 
 		if in.Password != "" {
-			// 修改密码
-			salt, err := s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).
-				Fields(dao.AdminMember.Columns().Salt).
-				Where("id", in.Id).
-				Value()
+			// 修改密码，需要获取到密码盐
+			salt, err := s.FilterAuthModel(ctx, opMemberId).Fields(cols.Salt).WherePri(in.Id).Value()
 			if err != nil {
+				err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+				return err
+			}
+			if salt.IsEmpty() {
+				err = gerror.New("该用户没有设置密码盐，请联系管理员！")
 				return err
 			}
 			in.PasswordHash = gmd5.MustEncryptString(in.Password + salt.String())
 		} else {
-			mod = mod.FieldsEx(dao.AdminMember.Columns().PasswordHash)
+			mod = mod.FieldsEx(cols.PasswordHash)
 		}
 
 		return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
-			if _, err = mod.Where("id", in.Id).Data(in).Update(); err != nil {
-				err = gerror.Wrap(err, consts.ErrorORM)
+			if _, err = mod.WherePri(in.Id).Data(in).Update(); err != nil {
+				err = gerror.Wrap(err, "修改用户信息失败，请稍后重试！")
 				return
 			}
 
 			// 更新岗位
 			if err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds); err != nil {
-				err = gerror.Wrap(err, consts.ErrorORM)
+				err = gerror.Wrap(err, "更新用户岗位失败，请稍后重试！")
 			}
 			return
 		})
@@ -499,62 +516,62 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
 	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
 		id, err := dao.AdminMember.Ctx(ctx).Data(data).InsertAndGetId()
 		if err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
+			err = gerror.Wrap(err, "新增用户失败，请稍后重试！")
 			return
 		}
 
 		// 更新岗位
 		if err = dao.AdminMemberPost.UpdatePostIds(ctx, id, in.PostIds); err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
+			err = gerror.Wrap(err, "新增用户岗位失败，请稍后重试！")
 		}
 		return
 	})
 }
 
-// View 获取信息
+// View 获取用户信息
 func (s *sAdminMember) View(ctx context.Context, in adminin.MemberViewInp) (res *adminin.MemberViewModel, err error) {
-	err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).
-		Hook(hook.MemberInfo).
-		Where("id", in.Id).
-		Scan(&res)
+	if err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Hook(hook.MemberInfo).WherePri(in.Id).Scan(&res); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
+	}
 	return
 }
 
 // List 获取列表
 func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list []*adminin.MemberListModel, totalCount int, err error) {
 	mod := s.FilterAuthModel(ctx, contexts.GetUserId(ctx))
+	cols := dao.AdminMember.Columns()
 
 	if in.RealName != "" {
-		mod = mod.WhereLike("real_name", "%"+in.RealName+"%")
+		mod = mod.WhereLike(cols.RealName, "%"+in.RealName+"%")
 	}
 
 	if in.Username != "" {
-		mod = mod.WhereLike("username", "%"+in.Username+"%")
+		mod = mod.WhereLike(cols.Username, "%"+in.Username+"%")
 	}
 
 	if in.Mobile > 0 {
-		mod = mod.Where("mobile", in.Mobile)
+		mod = mod.Where(cols.Mobile, in.Mobile)
 	}
 
 	if in.Status > 0 {
-		mod = mod.Where("status", in.Status)
+		mod = mod.Where(cols.Status, in.Status)
 	}
 
 	if in.DeptId > 0 {
-		mod = mod.Where("dept_id", in.DeptId)
+		mod = mod.Where(cols.DeptId, in.DeptId)
 	}
 
 	if in.RoleId > 0 {
-		mod = mod.Where("role_id", in.RoleId)
+		mod = mod.Where(cols.RoleId, in.RoleId)
 	}
 
 	if len(in.CreatedAt) == 2 {
-		mod = mod.WhereBetween("created_at", gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
+		mod = mod.WhereBetween(cols.CreatedAt, gtime.New(in.CreatedAt[0]), gtime.New(in.CreatedAt[1]))
 	}
 
 	totalCount, err = mod.Count()
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+		err = gerror.Wrap(err, "获取用户数据行失败！")
 		return
 	}
 
@@ -562,17 +579,19 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
 		return
 	}
 
-	if err = mod.Hook(hook.MemberInfo).Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
+	if err = mod.Hook(hook.MemberInfo).Page(in.Page, in.PerPage).OrderDesc(cols.Id).Scan(&list); err != nil {
+		err = gerror.Wrap(err, "获取用户列表失败！")
 		return
 	}
 
 	for i := 0; i < len(list); i++ {
 		posts, err := dao.AdminMemberPost.Ctx(ctx).
-			Fields("post_id").
-			Where("member_id", list[i].Id).
+			Fields(dao.AdminMemberPost.Columns().PostId).
+			Where(dao.AdminMemberPost.Columns().MemberId, list[i].Id).
 			Array()
 
 		if err != nil {
+			err = gerror.Wrap(err, "获取用户岗位数据失败！")
 			return nil, 0, err
 		}
 
@@ -586,36 +605,21 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
 
 // Status 更新状态
 func (s *sAdminMember) Status(ctx context.Context, in adminin.MemberStatusInp) (err error) {
-	if in.Id <= 0 {
-		err = gerror.New("ID不能为空")
-		return
-	}
-
 	if s.VerifySuperId(ctx, in.Id) {
 		err = gerror.New("超管账号不能更改状态")
 		return
 	}
 
-	if in.Status <= 0 {
-		err = gerror.New("状态不能为空")
-		return
+	if _, err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).WherePri(in.Id).Data(dao.AdminMember.Columns().Status, in.Status).Update(); err != nil {
+		err = gerror.Wrap(err, "更新用户状态失败，请稍后重试！")
 	}
-
-	if !validate.InSliceInt(consts.StatusSlice, in.Status) {
-		err = gerror.New("状态不正确")
-		return
-	}
-
-	// 修改
-	in.UpdatedAt = gtime.Now()
-	_, err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Where("id", in.Id).Data("status", in.Status).Update()
 	return
 }
 
 // GenTree 生成关系树
 func (s *sAdminMember) GenTree(ctx context.Context, pid int64) (level int, newTree string, err error) {
 	var pmb *entity.AdminMember
-	if err = dao.AdminMember.Ctx(ctx).Where("id", pid).Scan(&pmb); err != nil {
+	if err = dao.AdminMember.Ctx(ctx).WherePri(pid).Scan(&pmb); err != nil {
 		return
 	}
 
@@ -629,26 +633,6 @@ func (s *sAdminMember) GenTree(ctx context.Context, pid int64) (level int, newTr
 	return
 }
 
-// RoleMemberList 获取角色下的用户列表
-func (s *sAdminMember) RoleMemberList(ctx context.Context, in adminin.RoleMemberListInp) (list []*adminin.MemberListModel, totalCount int, err error) {
-	mod := dao.AdminMember.Ctx(ctx)
-	if in.Role > 0 {
-		mod = mod.Where("role", in.Role)
-	}
-
-	totalCount, err = mod.Count()
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-
-	if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	return
-}
-
 // LoginMemberInfo 获取登录用户信息
 func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginMemberInfoModel, err error) {
 	var memberId = contexts.GetUserId(ctx)
@@ -657,8 +641,8 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
 		return
 	}
 
-	if err = dao.AdminMember.Ctx(ctx).Hook(hook.MemberInfo).Where("id", memberId).Scan(&res); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+	if err = dao.AdminMember.Ctx(ctx).Hook(hook.MemberInfo).WherePri(memberId).Scan(&res); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 		return
 	}
 
@@ -677,7 +661,7 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
 	// 登录统计
 	stat, err := s.MemberLoginStat(ctx, adminin.MemberLoginStatInp{MemberId: memberId})
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	res.MemberLoginStatModel = stat
@@ -689,11 +673,16 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
 
 // MemberLoginStat 用户登录统计
 func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLoginStatInp) (res *adminin.MemberLoginStatModel, err error) {
-	var models *entity.SysLoginLog
+	var (
+		models *entity.SysLoginLog
+		cols   = dao.SysLoginLog.Columns()
+	)
+
 	err = dao.SysLoginLog.Ctx(ctx).
-		Fields("login_at,login_ip").
-		Where("member_id", in.MemberId).
-		Where("status", consts.StatusEnabled).
+		Fields(cols.LoginAt, cols.LoginIp).
+		Where(cols.MemberId, in.MemberId).
+		Where(cols.Status, consts.StatusEnabled).
+		OrderDesc(cols.Id).
 		Scan(&models)
 
 	if err != nil {
@@ -708,16 +697,16 @@ func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLog
 	res.LastLoginAt = models.LoginAt
 	res.LastLoginIp = models.LoginIp
 	res.LoginCount, err = dao.SysLoginLog.Ctx(ctx).
-		Where("member_id", in.MemberId).
-		Where("status", consts.StatusEnabled).
+		Where(cols.MemberId, in.MemberId).
+		Where(cols.Status, consts.StatusEnabled).
 		Count()
 	return
 }
 
 // GetIdByCode 通过邀请码获取用户ID
 func (s *sAdminMember) GetIdByCode(ctx context.Context, in adminin.GetIdByCodeInp) (res *adminin.GetIdByCodeModel, err error) {
-	if err = dao.AdminMember.Ctx(ctx).Fields(adminin.GetIdByCodeModel{}).Where("invite_code", in.Code).Scan(&res); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+	if err = dao.AdminMember.Ctx(ctx).Fields(adminin.GetIdByCodeModel{}).Where(dao.AdminMember.Columns().InviteCode, in.Code).Scan(&res); err != nil {
+		err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
 	}
 	return
 }
@@ -729,15 +718,14 @@ func (s *sAdminMember) Select(ctx context.Context, in adminin.MemberSelectInp) (
 		Handler(handler.FilterAuthWithField("id")).
 		Scan(&res)
 	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
+		err = gerror.Wrap(err, "获取可选用户选项失败，请稍后重试！")
 	}
 	return
 }
 
 // VerifySuperId 验证是否为超管
 func (s *sAdminMember) VerifySuperId(ctx context.Context, verifyId int64) bool {
-	superIds := g.Cfg().MustGet(ctx, "hotgo.admin.superIds")
-	for _, id := range superIds.Int64s() {
+	for _, id := range g.Cfg().MustGet(ctx, "hotgo.admin.superIds").Int64s() {
 		if id == verifyId {
 			return true
 		}

server/internal/logic/admin/menu.go

@@ -217,7 +217,7 @@ func (s *sAdminMenu) getChildrenList(menu *adminin.MenuRouteSummary, treeMap map
 }
 
 // GetMenuList 获取菜单列表
-func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (lists role.DynamicRes, err error) {
+func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (res *role.DynamicRes, err error) {
 	var (
 		allMenus []adminin.MenuRouteSummary
 		menus    []adminin.MenuRouteSummary
@@ -232,12 +232,12 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (lists rol
 			Where("role_id", contexts.GetRoleId(ctx)).
 			Array()
 		if err != nil {
-			return lists, err
+			return nil, err
 		}
 		if len(array) > 0 {
 			pidList, err := dao.AdminMenu.Ctx(ctx).Fields("pid").WhereIn("id", array).Group("pid").Array()
 			if err != nil {
-				return role.DynamicRes{}, err
+				return nil, err
 			}
 			if len(pidList) > 0 {
 				array = append(pidList, array...)
@@ -263,7 +263,8 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (lists rol
 		err = s.getChildrenList(&menus[i], treeMap)
 	}
 
-	lists.List = append(lists.List, s.genNaiveMenus(menus)...)
+	res = new(role.DynamicRes)
+	res.List = append(res.List, s.genNaiveMenus(menus)...)
 	return
 }
 

server/internal/logic/admin/role.go

@@ -11,7 +11,6 @@ import (
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
-	"hotgo/api/admin/role"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/casbin"
@@ -39,9 +38,9 @@ func init() {
 // Verify 验证权限
 func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 	var (
-		user         = contexts.Get(ctx).User
-		superRoleKey = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
-		err          error
+		user = contexts.Get(ctx).User
+		sk   = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
+		err  error
 	)
 
 	if user == nil {
@@ -49,7 +48,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
 		return false
 	}
 
-	if service.AdminMember().VerifySuperId(ctx, user.Id) || user.RoleKey == superRoleKey.String() {
+	if service.AdminMember().VerifySuperId(ctx, user.Id) || user.RoleKey == sk.String() {
 		return true
 	}
 
@@ -93,81 +92,75 @@ func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (res *adm
 }
 
 // GetName 获取指定角色的名称
-func (s *sAdminRole) GetName(ctx context.Context, RoleId int64) (name string, err error) {
-	roleName, err := dao.AdminRole.Ctx(ctx).
+func (s *sAdminRole) GetName(ctx context.Context, id int64) (name string, err error) {
+	r, err := dao.AdminRole.Ctx(ctx).
 		Fields("name").
-		Where("id", RoleId).
+		WherePri(id).
 		Order("id desc").
 		Value()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return name, err
+		return
 	}
 
-	return roleName.String(), nil
+	return r.String(), nil
 }
 
 // GetMemberList 获取指定用户的岗位列表
-func (s *sAdminRole) GetMemberList(ctx context.Context, RoleId int64) (list []*adminin.RoleListModel, err error) {
-	err = dao.AdminRole.Ctx(ctx).
-		Where("id", RoleId).
-		Order("id desc").
-		Scan(&list)
-	if err != nil {
+func (s *sAdminRole) GetMemberList(ctx context.Context, id int64) (list []*adminin.RoleListModel, err error) {
+	if err = dao.AdminRole.Ctx(ctx).WherePri(id).Order("id desc").Scan(&list); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return list, err
 	}
-
-	return list, err
+	return
 }
 
 // GetPermissions 更改角色菜单权限
-func (s *sAdminRole) GetPermissions(ctx context.Context, reqInfo *role.GetPermissionsReq) (MenuIds []int64, err error) {
+func (s *sAdminRole) GetPermissions(ctx context.Context, in adminin.GetPermissionsInp) (res *adminin.GetPermissionsModel, err error) {
 	values, err := dao.AdminRoleMenu.Ctx(ctx).
 		Fields("menu_id").
-		Where("role_id", reqInfo.RoleId).
+		Where("role_id", in.RoleId).
 		Array()
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	if len(values) == 0 {
 		return
 	}
 
+	res = new(adminin.GetPermissionsModel)
 	for i := 0; i < len(values); i++ {
-		MenuIds = append(MenuIds, values[i].Int64())
+		res.MenuIds = append(res.MenuIds, values[i].Int64())
 	}
 	return
 }
 
 // UpdatePermissions 更改角色菜单权限
-func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.UpdatePermissionsReq) (err error) {
+func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePermissionsInp) (err error) {
 	err = dao.AdminRoleMenu.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
-		_, err = dao.AdminRoleMenu.Ctx(ctx).Where("role_id", reqInfo.RoleId).Delete()
-		if err != nil {
+		if _, err = dao.AdminRoleMenu.Ctx(ctx).Where("role_id", in.RoleId).Delete(); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
-			return err
+			return
 		}
 
-		if len(reqInfo.MenuIds) == 0 {
-			return nil
+		if len(in.MenuIds) == 0 {
+			return
 		}
 
 		// 去重
-		reqInfo.MenuIds = convert.UniqueSliceInt64(reqInfo.MenuIds)
+		in.MenuIds = convert.UniqueSliceInt64(in.MenuIds)
 
-		addMap := make(g.List, 0, len(reqInfo.MenuIds))
-		for _, v := range reqInfo.MenuIds {
-			addMap = append(addMap, g.Map{
-				"role_id": reqInfo.RoleId,
+		list := make(g.List, 0, len(in.MenuIds))
+		for _, v := range in.MenuIds {
+			list = append(list, g.Map{
+				"role_id": in.RoleId,
 				"menu_id": v,
 			})
 		}
 
-		if _, err = dao.AdminRoleMenu.Ctx(ctx).Data(addMap).Insert(); err != nil {
+		if _, err = dao.AdminRoleMenu.Ctx(ctx).Data(list).Insert(); err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
-			return err
+			return
 		}
 
 		return
@@ -180,34 +173,12 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, reqInfo *role.Update
 	return casbin.Refresh(ctx)
 }
 
-func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {
-	if in.Name == "" {
-		err = gerror.New("名称不能为空")
+func (s *sAdminRole) Edit(ctx context.Context, in adminin.RoleEditInp) (err error) {
+	if err = hgorm.IsUnique(ctx, dao.AdminRole, g.Map{dao.AdminRole.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil {
 		return
 	}
 
-	if in.Key == "" {
-		err = gerror.New("编码不能为空")
-		return
-	}
-
-	uniqueName, err := dao.AdminRole.IsUniqueName(ctx, in.Id, in.Name)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	if !uniqueName {
-		err = gerror.New("名称已存在")
-		return
-	}
-
-	uniqueCode, err := dao.AdminRole.IsUniqueCode(ctx, in.Id, in.Key)
-	if err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return
-	}
-	if !uniqueCode {
-		err = gerror.New("编码已存在")
+	if err = hgorm.IsUnique(ctx, dao.AdminRole, g.Map{dao.AdminRole.Columns().Key: in.Key}, "编码已存在", in.Id); err != nil {
 		return
 	}
 
@@ -227,8 +198,9 @@ func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {
 
 		err = dao.AdminRole.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 			// 更新数据
-			_, err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Data(in).Update()
+			_, err = dao.AdminRole.Ctx(ctx).Fields(adminin.RoleUpdateFields{}).WherePri(in.Id).Data(in).Update()
 			if err != nil {
+				err = gerror.Wrap(err, consts.ErrorORM)
 				return err
 			}
 
@@ -239,7 +211,10 @@ func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {
 	}
 
 	// 新增
-	_, err = dao.AdminRole.Ctx(ctx).Data(in).Insert()
+	if _, err = dao.AdminRole.Ctx(ctx).Fields(adminin.RoleInsertFields{}).Data(in).Insert(); err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return
+	}
 	return
 }
 
@@ -265,11 +240,7 @@ func updateRoleChildrenTree(ctx context.Context, _id int64, _level int, _tree st
 	return
 }
 
-func (s *sAdminRole) Delete(ctx context.Context, in *role.DeleteReq) (err error) {
-	if in.Id <= 0 {
-		return gerror.New("ID不正确！")
-	}
-
+func (s *sAdminRole) Delete(ctx context.Context, in adminin.RoleDeleteInp) (err error) {
 	var models *entity.AdminRole
 	if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
 		return
@@ -279,20 +250,23 @@ func (s *sAdminRole) Delete(ctx context.Context, in *role.DeleteReq) (err error)
 		return gerror.New("数据不存在或已删除！")
 	}
 
-	pidExist, err := dao.AdminRole.Ctx(ctx).Where("pid", models.Id).One()
+	has, err := dao.AdminRole.Ctx(ctx).Where("pid", models.Id).One()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
-		return err
+		return
 	}
-	if !pidExist.IsEmpty() {
+
+	if !has.IsEmpty() {
 		return gerror.New("请先删除该角色下得所有子级！")
 	}
 
-	_, err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Delete()
+	if _, err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Delete(); err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+	}
 	return
 }
 
-func (s *sAdminRole) DataScopeSelect(ctx context.Context) (res form.Selects) {
+func (s *sAdminRole) DataScopeSelect() (res form.Selects) {
 	for k, v := range consts.RoleDataNameMap {
 		res = append(res, &form.Select{
 			Value: k,
@@ -305,13 +279,9 @@ func (s *sAdminRole) DataScopeSelect(ctx context.Context) (res form.Selects) {
 }
 
 func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEditInp) (err error) {
-	if in.Id <= 0 {
-		return gerror.New("角色ID不正确！")
-	}
-
 	var (
-		models       *entity.AdminRole
-		superRoleKey = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
+		models *entity.AdminRole
+		sk     = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
 	)
 
 	if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
@@ -322,7 +292,7 @@ func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEdi
 		return gerror.New("角色不存在")
 	}
 
-	if models.Key == superRoleKey.String() {
+	if models.Key == sk.String() {
 		return gerror.New("超管角色拥有全部权限，无需修改！")
 	}
 
@@ -342,7 +312,7 @@ func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEdi
 	return
 }
 
-// treeList 树状列表
+// treeList 角色树列表
 func (s *sAdminRole) treeList(pid int64, nodes []*entity.AdminRole) (list []*adminin.RoleTree) {
 	list = make([]*adminin.RoleTree, 0)
 	for _, v := range nodes {