[feat] 统一 orm 入口

base/res_condition.go

@@ -1,7 +1,5 @@
 package base
 
-import "git.fsdpf.net/go/contracts"
-
 type ResCondition struct {
 	Id                 int    `db:"id"`
 	Pid                int    `db:"pid"`
@@ -38,5 +36,3 @@ type ResWhereExpr struct {
 }
 
 type GetResConditions func(categoryUuid string) []ResCondition
-
-type GetOrmConditionByRes func(categoryUuid string, describe string) contracts.Condition

base/resource.go

@@ -11,7 +11,6 @@ import (
 	"github.com/samber/lo"
 
 	"git.fsdpf.net/go/contracts"
-	"git.fsdpf.net/go/contracts/helper"
 	"git.fsdpf.net/go/contracts/support"
 	"git.fsdpf.net/go/db"
 )
@@ -218,14 +217,14 @@ func (this Resource) WithRolesCondition(b *db.Builder, t string, u contracts.Use
 	isFullRight := false
 	isFullNot := false
 
-	NewOrm := do.MustInvoke[helper.NewOrm](this.container)
-	NewOrmModel := do.MustInvoke[helper.NewOrmModel](this.container)
-	NewOrmJoin := do.MustInvoke[helper.NewOrmJoin](this.container)
+	NewOrm := do.MustInvoke[contracts.NewOrm](this.container)
+	NewOrmModel := do.MustInvoke[contracts.NewOrmModel](this.container)
+	NewOrmJoin := do.MustInvoke[contracts.NewOrmJoin](this.container)
 
 	GetResRelationResource := do.MustInvoke[GetResRelationResource](this.container)
 	GetResRelations := do.MustInvoke[GetResRelations](this.container)
 	GetResource := do.MustInvoke[contracts.GetResource](this.container)
-	GetOrmConditionByRes := do.MustInvoke[GetOrmConditionByRes](this.container)
+	GetOrmConditionByRes := do.MustInvoke[contracts.GetOrmConditionByRes](this.container)
 
 	items := do.MustInvoke[GetResRoles](this.container)(this.GetUuid(), u.Roles()...)