diff --git a/backend/app/dto/database.go b/backend/app/dto/database.go
index d40c2fe6a..4b57f31c9 100644
--- a/backend/app/dto/database.go
+++ b/backend/app/dto/database.go
@@ -285,7 +285,7 @@ type DatabaseCreate struct {
 	Address  string `json:"address"`
 	Port     uint   `json:"port"`
 	Username string `json:"username" validate:"required"`
-	Password string `json:"password" validate:"required"`
+	Password string `json:"password"`
 
 	SSL        bool   `json:"ssl"`
 	RootCert   string `json:"rootCert"`
diff --git a/backend/app/service/database.go b/backend/app/service/database.go
index 5dd438ca3..402bf6954 100644
--- a/backend/app/service/database.go
+++ b/backend/app/service/database.go
@@ -43,6 +43,7 @@ func (u *DatabaseService) SearchWithPage(search dto.DatabaseSearch) (int64, inte
 	total, dbs, err := databaseRepo.Page(search.Page, search.PageSize,
 		databaseRepo.WithTypeList(search.Type),
 		commonRepo.WithLikeName(search.Info),
+		commonRepo.WithOrderRuleBy(search.OrderBy, search.Order),
 		databaseRepo.WithoutByFrom("local"),
 	)
 	var datas []dto.DatabaseInfo