u

code/go-project/base-farmework/pkg/utils/db/select.go

@@ -1,48 +1,62 @@
 package db
 
 import (
+	"database/sql"
 	"fmt"
 )
 
-func (c *Client) QueryRows(query string, args ...any) ([]map[string]any, error) {
+func (c *Client) QueryRows(query string) ([]map[string]interface{}, error) {
 	if c.Conn == nil {
 		return nil, fmt.Errorf("database connection is nil")
 	}
 
-	rows, err := c.Conn.Query(query, args...)
+	rows, err := c.Conn.Query(query)
 	if err != nil {
-		return nil, err // 不加 debug.Stack()
+		return nil, fmt.Errorf("query error: %v", err)
 	}
-	defer rows.Close()
+	defer func(rows *sql.Rows) {
+		err := rows.Close()
+		if err != nil {
+			fmt.Println("关闭资源失败")
+		}
+	}(rows)
 
-	columns, err := rows.Columns()
+	// 获取列名
+	cols, err := rows.Columns()
 	if err != nil {
 		return nil, err
 	}
 
-	results := make([]map[string]any, 0)
+	var result []map[string]interface{}
+
 	for rows.Next() {
-		values := make([]any, len(columns))
-		valuePtrs := make([]any, len(columns))
-		for i := range columns {
-			valuePtrs[i] = &values[i]
+		// 创建扫描用的切片
+		columnPointers := make([]interface{}, len(cols))
+		columnValues := make([]interface{}, len(cols))
+		for i := range columnPointers {
+			columnPointers[i] = &columnValues[i]
 		}
 
-		if err := rows.Scan(valuePtrs...); err != nil {
+		if err := rows.Scan(columnPointers...); err != nil {
 			return nil, err
 		}
 
-		rowMap := make(map[string]any)
-		for i, col := range columns {
-			rowMap[col] = values[i]
+		rowMap := make(map[string]interface{})
+		for i, colName := range cols {
+			val := columnValues[i]
+			if b, ok := val.([]byte); ok {
+				rowMap[colName] = string(b)
+			} else {
+				rowMap[colName] = val
+			}
 		}
 
-		results = append(results, rowMap)
+		result = append(result, rowMap)
 	}
 
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
 
-	return results, nil
+	return result, nil
 }