'commit'

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"

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

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

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()

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

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