diff --git a/features/dbrest/dbrest.go b/features/dbrest/dbrest.go index b93d9054..d547817e 100644 --- a/features/dbrest/dbrest.go +++ b/features/dbrest/dbrest.go @@ -109,19 +109,35 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err } func GetUriSQLArray(r *http.Request) []string { + var sa []string vars := r.URL.Query() - s, ok := vars["SQL"] - if !ok { - log.Info("SQL is not exist") - return nil + + // 默认SQL + if s, ok := vars["SQL"]; ok { + for _, r := range s { + if r != "" { + sa = append(sa, r) + } + } } - var sa []string - for _, r := range s { - if r != "" { - sa = append(sa, r) + // 查询总数 + if totalSQL, ok := vars["totalSQL"]; ok { + if totalSQL[0] != "" { + sa = append(sa, totalSQL[0]) } } + // 查询列表 + if rowsSQL, ok := vars["rowsSQL"]; ok { + if rowsSQL[0] != "" { + sa = append(sa, rowsSQL[0]) + } + } + + if len(sa) == 0 { + log.Info("SQL is not exist") + return nil + } log.Debug("SQL array:", sa) return sa