xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-12 04:03:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

系统大量出现where("id",xx) fields("user_id") 固定字符串，修改按照统一规范使用dao.xxx.Columns().xxx

Browse Source
This commit is contained in:
ss
2025-04-21 17:46:06 +08:00
parent 0c5b27d864
commit 19c0c0c1bc
34 changed files with 272 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/internal/library/hgorm/handler/filter_auth.go
View File

@@ -7,14 +7,16 @@ package handler
import (
"context"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/text/gstr"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/contexts"
"hotgo/internal/model/entity"
"hotgo/utility/convert"
"hotgo/utility/tree"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/text/gstr"
)
// FilterAuth 过滤数据权限
@@ -56,7 +58,7 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
return m
}
err := g.Model("admin_role").Where("id", co.User.RoleId).Scan(&role)
err := dao.AdminRole.Ctx(ctx).Where(dao.AdminRole.Columns().Id, co.User.RoleId).Scan(&role)
if err != nil {
g.Log().Panicf(ctx, "failed to role information err:%+v", err)
}
@@ -71,7 +73,7 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
}
getDeptIds := func(in interface{}) []gdb.Value {
ds, err := g.Model("admin_member").Fields("id").Where("dept_id", in).Array()
ds, err := dao.AdminMember.Ctx(ctx).Fields(dao.AdminMember.Columns().Id).Where(dao.AdminMember.Columns().DeptId, in).Array()
if err != nil {
g.Log().Panic(ctx, "failed to get member dept data")
}
@@ -102,9 +104,9 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
// GetDeptAndSub 获取指定部门的所有下级，含本部门
func GetDeptAndSub(ctx context.Context, deptId int64) (ids []int64) {
array, err := g.Model("admin_dept").
WhereLike("tree", "%"+tree.GetIdLabel(deptId)+"%").
Fields("id").
array, err := dao.AdminDept.Ctx(ctx).
WhereLike(dao.AdminDept.Columns().Tree, "%"+tree.GetIdLabel(deptId)+"%").
Fields(dao.AdminDept.Columns().Id).
Array()
if err != nil {
g.Log().Panicf(ctx, "GetDeptAndSub err:%+v", err)
@@ -121,9 +123,9 @@ func GetDeptAndSub(ctx context.Context, deptId int64) (ids []int64) {
// GetSelfAndSub 获取直属下级，包含自己
func GetSelfAndSub(ctx context.Context, memberId int64) (ids []int64) {
array, err := g.Model("admin_member").
Where("pid", memberId).
Fields("id").
array, err := dao.AdminMember.Ctx(ctx).
Where(dao.AdminMember.Columns().Pid, memberId).
Fields(dao.AdminMember.Columns().Id).
Array()
if err != nil {
g.Log().Panicf(ctx, "GetSelfAndSub err:%+v", err)
@@ -140,9 +142,9 @@ func GetSelfAndSub(ctx context.Context, memberId int64) (ids []int64) {
// GetSelfAndAllSub 获取全部下级，包含自己
func GetSelfAndAllSub(ctx context.Context, memberId int64) (ids []int64) {
array, err := g.Model("admin_member").
WhereLike("tree", "%"+tree.GetIdLabel(memberId)+"%").
Fields("id").
array, err := dao.AdminMember.Ctx(ctx).
WhereLike(dao.AdminMember.Columns().Tree, "%"+tree.GetIdLabel(memberId)+"%").
Fields(dao.AdminMember.Columns().Id).
Array()
if err != nil {
g.Log().Panicf(ctx, "GetSelfAndAllSub err:%+v", err)

19
server/internal/library/hgorm/hook/member.go
View File

@@ -7,10 +7,11 @@ package hook
import (
"context"
"hotgo/internal/dao"
"hotgo/utility/convert"
"github.com/gogf/gf/v2/container/gvar"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g"
"hotgo/utility/convert"
)
// MemberInfo 后台用户信息
@@ -23,9 +24,9 @@ var MemberInfo = gdb.HookHandler{
for i, record := range result {
// 部门
if !record["dept_id"].IsEmpty() {
deptName, err := g.Model("admin_dept").Ctx(ctx).
Fields("name").
Where("id", record["dept_id"]).
deptName, err := dao.AdminDept.Ctx(ctx).
Fields(dao.AdminDept.Columns().Name).
Where(dao.AdminDept.Columns().Id, record["dept_id"]).
Value()
if err != nil {
break
@@ -35,9 +36,9 @@ var MemberInfo = gdb.HookHandler{
// 角色
if !record["role_id"].IsEmpty() {
roleName, err := g.Model("admin_role").Ctx(ctx).
Fields("name").
Where("id", record["role_id"]).
roleName, err := dao.AdminRole.Ctx(ctx).
Fields(dao.AdminRole.Columns().Name).
Where(dao.AdminRole.Columns().Id, record["role_id"]).
Value()
if err != nil {
break
@@ -109,7 +110,7 @@ var MemberSummary = gdb.HookHandler{
}
var members []*MemberSumma
if err = g.Model("admin_member").Ctx(ctx).Fields(MemberSumma{}).WhereIn("id", memberIds).Scan(&members); err != nil {
if err = dao.AdminMember.Ctx(ctx).Fields(MemberSumma{}).WhereIn(dao.AdminMember.Columns().Id, memberIds).Scan(&members); err != nil {
return nil, err
}