From d28c54a146e66d76b8f81be6b83a15adf94847bb Mon Sep 17 00:00:00 2001 From: wangshuai Date: Thu, 3 Sep 2020 15:48:06 +0800 Subject: [PATCH] 'commit' --- .../MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go | 11 +++++------ .../MyModel/DataError/DataerrorDAO/DataerrorDAO.go | 10 +++++----- .../MyModel/DataSource/DatasourceDAO/DatasourceDAO.go | 10 +++++----- dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go | 2 +- dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go | 10 +++++----- dsSupport/MyModel/OrgTree/OrgtreeDAO/OrgtreeDAO.go | 10 +++++----- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go index 50fac0d7..c991a856 100644 --- a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go +++ b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go @@ -26,12 +26,11 @@ func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int, [ conditionSql := fmt.Sprintf("%s", " limit ? offset ? ") //分页的语句 pageSql := fmt.Sprintf("%s %s", sql, conditionSql) - //分页数据当前页现存条数 - count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count() - - if count > 0 { - //分页数据 - list, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + //数据条数 + count, _ := DbUtil.Engine.SQL(sql).Query().Count() + //分页数据 + list, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + if list != nil { listJson, _ :=json.Marshal(list) sql1 := "SELECT * FROM t_dataex_datasource WHERE 1 = 1" diff --git a/dsSupport/MyModel/DataError/DataerrorDAO/DataerrorDAO.go b/dsSupport/MyModel/DataError/DataerrorDAO/DataerrorDAO.go index b94deae7..36165a68 100644 --- a/dsSupport/MyModel/DataError/DataerrorDAO/DataerrorDAO.go +++ b/dsSupport/MyModel/DataError/DataerrorDAO/DataerrorDAO.go @@ -30,11 +30,11 @@ func GetDataerrorResults(query MySwagger.DataerrorQuery) (bool, string, int, []m conditionSql := fmt.Sprintf("%s", " limit ? offset ? ") //分页的语句 pageSql := fmt.Sprintf("%s %s", sql, conditionSql) - //分页数据当前页现存条数 - count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count() - if count > 0 { - //分页数据 - list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + //数据条数 + count, _ := DbUtil.Engine.SQL(sql).Query().Count() + //分页数据 + list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + if list != nil { return true, "数据获取成功", count, list, err } else { return false, "数据获取失败，数据源不存在", count, nil, nil diff --git a/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go b/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go index 3e92bf09..e1915ed4 100644 --- a/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go +++ b/dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go @@ -22,11 +22,11 @@ func GetDatasourceResults(query MySwagger.DatasourceQuery) (bool, string, int, [ conditionSql := fmt.Sprintf("%s", " limit ? offset ? ") //分页的语句 pageSql := fmt.Sprintf("%s %s", sql, conditionSql) - //分页数据当前页现存条数 - count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count() - if count > 0 { - //分页数据 - list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + //数据条数 + count, _ := DbUtil.Engine.SQL(sql).Query().Count() + //分页数据 + list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + if list != nil { return true, "数据获取成功", count, list, err } else { return false, "数据获取失败，数据源不存在", count, nil, nil diff --git a/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go b/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go index 21a51bd4..41472dc0 100644 --- a/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go +++ b/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go @@ -21,7 +21,7 @@ func GetJyt2012Results(query MySwagger.Jyt2012Query) (bool, string, int, []map[s conditionSql := fmt.Sprintf("%s", " limit ? offset ? ") //分页的语句 pageSql := fmt.Sprintf("%s %s", sql, conditionSql) - //分页数据当前页现存条数 + //数据条数 count, _ := DbUtil.Engine.SQL(sql).Query().Count() //分页数据 list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() diff --git a/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go b/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go index 0cd29bf7..a504b63b 100644 --- a/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go +++ b/dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go @@ -21,11 +21,11 @@ func GetMetadataResults(query MySwagger.MetadataQuery) (bool, string, int, []map conditionSql := fmt.Sprintf("%s", " limit ? offset ? ") //分页的语句 pageSql := fmt.Sprintf("%s %s", sql, conditionSql) - //分页数据当前页现存条数 - count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count() - if count > 0 { - //分页数据 - list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + //数据条数 + count, _ := DbUtil.Engine.SQL(sql).Query().Count() + //分页数据 + list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + if list != nil { return true, "数据获取成功", count, list, err } else { return false, "数据获取失败，数据源不存在", count, nil, nil diff --git a/dsSupport/MyModel/OrgTree/OrgtreeDAO/OrgtreeDAO.go b/dsSupport/MyModel/OrgTree/OrgtreeDAO/OrgtreeDAO.go index 973461fe..ca1ae21d 100644 --- a/dsSupport/MyModel/OrgTree/OrgtreeDAO/OrgtreeDAO.go +++ b/dsSupport/MyModel/OrgTree/OrgtreeDAO/OrgtreeDAO.go @@ -22,11 +22,11 @@ func GetOrgtreeResults(query MySwagger.OrgtreeQuery) (bool, string, int, []map[s conditionSql := fmt.Sprintf("%s", " limit ? offset ? ") //分页的语句 pageSql := fmt.Sprintf("%s %s", sql, conditionSql) - //分页数据当前页现存条数 - count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count() - if count > 0 { - //分页数据 - list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + //数据条数 + count, _ := DbUtil.Engine.SQL(sql).Query().Count() + //分页数据 + list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List() + if list != nil { return true, "数据获取成功", count, list, err } else { return false, "数据获取失败，数据源不存在", count, nil, nil