xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-14 21:23:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1、泛型化参数，预留泛型约束，方便以后代码扩展的类型安全校验

Browse Source 
2、升级goframe至v2.7.3
This commit is contained in:
apefuu
2024-09-19 19:33:00 +08:00
parent 2a87055b62
commit f18ce6384b
57 changed files with 221 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/internal/library/hgorm/handler/tenant.go
View File

@@ -14,7 +14,7 @@ import (
// FilterTenant 过滤多租户数据权限
// 根据部门类型识别当前租户、商户、用户身份，过滤只属于自己的数据
func FilterTenant(m *gdb.Model) *gdb.Model {
func FilterTenant[T any](m *gdb.Model) *gdb.Model {
var (
needAuth bool
filterField string
@@ -23,19 +23,19 @@ func FilterTenant(m *gdb.Model) *gdb.Model {
)
// 租户
if contexts.IsTenantDept(ctx) && gstr.InArray(fields, "tenant_id") {
if contexts.IsTenantDept[T](ctx) && gstr.InArray(fields, "tenant_id") {
needAuth = true
filterField = "tenant_id"
}
// 商户
if contexts.IsMerchantDept(ctx) && gstr.InArray(fields, "merchant_id") {
if contexts.IsMerchantDept[T](ctx) && gstr.InArray(fields, "merchant_id") {
needAuth = true
filterField = "merchant_id"
}
// 用户
if contexts.IsUserDept(ctx) && gstr.InArray(fields, "user_id") {
if contexts.IsUserDept[T](ctx) && gstr.InArray(fields, "user_id") {
needAuth = true
filterField = "user_id"
}
@@ -44,6 +44,6 @@ func FilterTenant(m *gdb.Model) *gdb.Model {
return m
}
m = m.Where(filterField, contexts.GetUserId(ctx))
m = m.Where(filterField, contexts.GetUserId[T](ctx))
return m
}