@@ -30,7 +30,7 @@ import (
30
30
type MysqlService struct {}
31
31
32
32
type IMysqlService interface {
33
- SearchWithPage (search dto.SearchWithPage ) (int64 , interface {}, error )
33
+ SearchWithPage (search dto.MysqlDBSearch ) (int64 , interface {}, error )
34
34
ListDBName () ([]string , error )
35
35
Create (ctx context.Context , req dto.MysqlDBCreate ) (* model.DatabaseMysql , error )
36
36
ChangeAccess (info dto.ChangeDBInfo ) error
@@ -50,8 +50,12 @@ func NewIMysqlService() IMysqlService {
50
50
return & MysqlService {}
51
51
}
52
52
53
- func (u * MysqlService ) SearchWithPage (search dto.SearchWithPage ) (int64 , interface {}, error ) {
54
- total , mysqls , err := mysqlRepo .Page (search .Page , search .PageSize , commonRepo .WithLikeName (search .Info ), commonRepo .WithOrderRuleBy (search .OrderBy , search .Order ))
53
+ func (u * MysqlService ) SearchWithPage (search dto.MysqlDBSearch ) (int64 , interface {}, error ) {
54
+ total , mysqls , err := mysqlRepo .Page (search .Page , search .PageSize ,
55
+ mysqlRepo .WithByFrom (search .From ),
56
+ commonRepo .WithLikeName (search .Info ),
57
+ commonRepo .WithOrderRuleBy (search .OrderBy , search .Order ),
58
+ )
55
59
var dtoMysqls []dto.MysqlDBInfo
56
60
for _ , mysql := range mysqls {
57
61
var item dto.MysqlDBInfo
0 commit comments