diff --git a/data/address/cn.v1.xlsx b/data/address/cn.v1.xlsx index c06d224e4e55f623aec42da8eb86409b1119cfcf..2200688488158abe216a40337affc6276f5b9a24 100644 Binary files a/data/address/cn.v1.xlsx and b/data/address/cn.v1.xlsx differ diff --git a/demo/19_from_excel.yaml b/demo/19_from_excel.yaml index db4876ba96f9ee3f6176244b81bd85bf99e72670..e0936916e0ca927f8d5b4a9227f78df785b9e534 100644 --- a/demo/19_from_excel.yaml +++ b/demo/19_from_excel.yaml @@ -26,7 +26,7 @@ fields: postfix: "\t" - field: columns # 变量,从excel中读取的列。如果命令指定-F参数,需要包含以避免忽略处理。 - range: [city,state] + range: [city,state, stateShort] postfix: "\t" - field: conditions # 变量,用于where条件里。如果命令指定-F参数,需要包含以避免忽略处理。 range: [山东,江苏] diff --git a/src/gen/excel.go b/src/gen/excel.go index 4424eab65bbe6c06096cbbac9b48981b646b8c79..016d1c35ed5a4867082d19eb19ae2c0719c6bb40 100644 --- a/src/gen/excel.go +++ b/src/gen/excel.go @@ -291,7 +291,6 @@ func ReadDataFromSQLite(field model.DefField, dbName string, tableName string, t sqlStr := fmt.Sprintf("SELECT %s FROM `%s` WHERE %s", colStr, from, where) rows, err := vari.DB.Raw(sqlStr).Rows() - defer rows.Close() if err != nil { logUtils.PrintTo(i118Utils.I118Prt.Sprintf("fail_to_exec_query", "", err.Error())) @@ -300,6 +299,7 @@ func ReadDataFromSQLite(field model.DefField, dbName string, tableName string, t return list, "" } + defer rows.Close() valMapArr := make([]map[string]string, 0) columns, err := rows.Columns() colNum := len(columns)