[feat] 命名规范 GetOrmConditionByRes => GetOrmConditions
This commit is contained in:
@@ -224,7 +224,7 @@ func (this Resource) WithRolesCondition(b *db.Builder, t string, u req.User) err
|
||||
GetResRelationResource := do.MustInvoke[GetResRelationResource](this.container)
|
||||
GetResRelations := do.MustInvoke[GetResRelations](this.container)
|
||||
GetResource := do.MustInvoke[contracts.GetResource](this.container)
|
||||
GetOrmConditionByRes := do.MustInvoke[contracts.GetOrmConditionByRes](this.container)
|
||||
GetOrmConditions := do.MustInvoke[contracts.GetOrmConditions](this.container)
|
||||
|
||||
items := do.MustInvoke[GetResRoles](this.container)(this.GetUuid(), u.Roles()...)
|
||||
|
||||
@@ -247,12 +247,12 @@ func (this Resource) WithRolesCondition(b *db.Builder, t string, u req.User) err
|
||||
|
||||
join := NewOrmJoin(contracts.RelationType(joins[i].Type), oResource, joins[i].Code, joins[i].RelationResource, joins[i].RelationField, joins[i].RelationForeignKey)
|
||||
// 关联扩展条件
|
||||
join.SetCondition(GetOrmConditionByRes(joins[i].Uuid, "关联扩展条件"))
|
||||
join.SetCondition(GetOrmConditions(joins[i].Uuid, "关联扩展条件"))
|
||||
|
||||
join.Inject(db, NewOrmModel(rResource, rResource.GetCode(), rResource.GetName()))
|
||||
}
|
||||
|
||||
conditions := GetOrmConditionByRes(item.Uuid, "关联扩展条件")
|
||||
conditions := GetOrmConditions(item.Uuid, "关联扩展条件")
|
||||
|
||||
if len(joins) == 0 && conditions.IsEmpty() {
|
||||
// 无权限, 直接跳过这个 unoin 语句
|
||||
|
||||
Reference in New Issue
Block a user