修改,兼容go-admin sdk方案

This commit is contained in:
linwenxiang
2021-03-09 19:12:49 +08:00
parent c541d09076
commit 25d8364bf4
151 changed files with 578 additions and 3525 deletions
+2 -2
View File
@@ -2,7 +2,7 @@ package dto
import (
"github.com/go-admin-team/go-admin-core/tools/search"
"go-admin/tools/app"
"go-admin/common/global"
"gorm.io/gorm"
)
@@ -44,7 +44,7 @@ func MakeCondition(q interface{}) func(db *gorm.DB) *gorm.DB {
GormPublic: search.GormPublic{},
Join: make([]*search.GormJoin, 0),
}
search.ResolveSearchQuery(app.Driver, q, condition)
search.ResolveSearchQuery(global.Driver, q, condition)
for _, join := range condition.Join {
if join == nil {
continue