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