'commit'

Logs/dsSupport.log

@@ -26,3 +26,7 @@
 [Error]2020/09/01 09:10:09 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
 [Error]2020/09/01 09:13:36 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
 [Error]2020/09/01 09:13:36 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
+[Error]2020/09/01 10:08:28 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
+[Error]2020/09/01 10:08:28 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
+[Error]2020/09/01 10:11:52 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
+[Error]2020/09/01 10:11:52 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1

dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go

@@ -14,8 +14,8 @@ import (
 var db = DbUtil.Engine
 
 func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32, []map[string]interface{}, error) {
-	//sql := "SELECT id FROM t_dataex_dataaccess WHERE 1 = 1" + query.Conditions
-	sql := "SELECT ls.id source_systemid, ls.system_name source_systemname, ls1.system_name consume_systemname, da.* FROM t_dataex_dataaccess da LEFT JOIN t_dataex_datasource ds ON da.datasource_id = ds.id LEFT JOIN t_dataex_linksystem ls ON ls.id = ds.system_id LEFT JOIN t_dataex_linksystem ls1 ON ls1.id = da.consume_systemid" + query.Conditions
+	sql := "SELECT id FROM t_dataex_dataaccess WHERE 1 = 1" + query.Conditions
+	//sql := "SELECT ls.id source_systemid, ls.system_name source_systemname, ls1.system_name consume_systemname, da.* FROM t_dataex_dataaccess da LEFT JOIN t_dataex_datasource ds ON da.datasource_id = ds.id LEFT JOIN t_dataex_linksystem ls ON ls.id = ds.system_id LEFT JOIN t_dataex_linksystem ls1 ON ls1.id = da.consume_systemid" + query.Conditions
 	fmt.Println("sql=", sql)
 
 	//通过SQL获取带缓存的数据

dsSupport/Utils/CacheUtil/DaoCache.go

@@ -143,15 +143,12 @@ func batchReadRedis(ids []string, prefix string) ([]map[string]interface{}, []st
 */
 func count(baseSql string, pkField string, args []interface{}) (int32, error) {
 	//替换掉分页代码，获取数据量总数
-	//reg := regexp.MustCompile(`SELECT ` + pkField + ` `)
 	countSql := strings.Replace(baseSql, "SELECT "+pkField+" ", "SELECT count(*) as count ", -1)
-	//countSql := reg.ReplaceAllString(baseSql, "SELECT count(*) as count ")
-		fmt.Println("countSql==", countSql)
+
 	var count int32
 	//去掉最后的limit+offset
 	args = args[0 : len(args)-2]
 	_, err := DbUtil.Engine.SQL(countSql, args...).Get(&count)
-	fmt.Println("err==", err)
 	if err != nil {
 		LogUtil.Error(ErrorConst.SqlQueryError, err.Error())
 		return 0, err