diff --git a/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go b/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go index 573637d7..21a51bd4 100644 --- a/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go +++ b/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go @@ -22,10 +22,10 @@ func GetJyt2012Results(query MySwagger.Jyt2012Query) (bool, string, int, []map[s //分页的语句 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/MySwagger/Result.go b/dsSupport/MyModel/MySwagger/Result.go index ddc012db..4902cff2 100644 --- a/dsSupport/MyModel/MySwagger/Result.go +++ b/dsSupport/MyModel/MySwagger/Result.go @@ -5,6 +5,5 @@ type Result struct { Fail bool `json:"fail" example:"false"` Message string `json:"message" example:"操作成功"` Total int `json:"total" example:"120"` - Count int `json:"total" example:"120"` Data []map[string]interface{} `json:"data" ` }