修改参数

models/ai_summary/ai_summary.go

@@ -154,7 +154,7 @@ func GetAiSummaryListCountByCondition(condition string, pars []interface{}) (cou
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/data_manage/base_from_bloomberg_index.go

@@ -156,7 +156,7 @@ func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []in
 	if limit > 0 {
 		sql += fmt.Sprintf(` LIMIT %d`, limit)
 	}
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_business_data.go

@@ -75,7 +75,7 @@ func (m *BaseFromBusinessData) GetAllDataList(condition string, pars []interface
 		sql += ` ORDER BY ` + order
 	}
 
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&result).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&result).Error
 
 	return
 }
@@ -102,7 +102,7 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition string, pars []interfa
 
 	sql += fmt.Sprintf(` LIMIT %d`, size)
 
-	err = o.Raw(sql, pars).Scan(&result).Error
+	err = o.Raw(sql, pars...).Scan(&result).Error
 
 	return
 }
@@ -130,7 +130,7 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 
 	sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, size)
 
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&result).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&result).Error
 
 	return
 }
@@ -148,7 +148,7 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_business_index.go

@@ -110,7 +110,7 @@ func (m *BaseFromBusinessIndex) GetListCount(condition string, pars []interface{
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -210,12 +210,13 @@ func (m *BaseFromBusinessIndex) GeItemsByCondition(condition string, pars []inte
 	}
 	sql += ` order by a.base_from_business_index_id desc `
 
+	pars = append(pars, utils.DATA_SOURCE_BUSINESS)
 	if limitSize > 0 {
 		sql += " limit ? "
 		pars = append(pars, limitSize)
 	}
 
-	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_BUSINESS, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ccf_classify.go

@@ -36,7 +36,7 @@ type BaseFromCCFClassifyItem struct {
 	Sort         int                        `description:"排序字段"`
 	CreateTime   string                     `description:"创建时间"`
 	ModifyTime   string                     `description:"修改时间"`
-	Child        []*BaseFromCCFClassifyItem `description:"子分类"`
+	Child        []*BaseFromCCFClassifyItem `gorm:"-" description:"子分类"`
 }
 
 func (y *BaseFromCCFClassify) Format2Item(origin *BaseFromCCFClassify) (item *BaseFromCCFClassifyItem) {

models/data_manage/base_from_edb_mapping.go

@@ -100,7 +100,7 @@ func (m *BaseFromEdbMapping) RemoveByCondition(condition string, pars []interfac
 		return
 	}
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Exec(sql, pars).Error
+	err = global.DmSQL["data"].Exec(sql, pars...).Error
 
 	return
 }
@@ -118,14 +118,14 @@ func (m *BaseFromEdbMapping) GetItemByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }
 
 func (m *BaseFromEdbMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -140,7 +140,7 @@ func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&items).Error
 
 	return
 }

models/data_manage/base_from_eia_stero.go

@@ -108,7 +108,7 @@ func GetEiaSteoIndexList(condition string, pars []interface{}) (items []*BaseFro
 	sql := ` SELECT *  FROM base_from_eia_steo_index WHERE 1=1  `
 	sql += condition
 	sql += ` ORDER BY base_from_eia_steo_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_fenwei.go

@@ -258,7 +258,7 @@ func GetFenWeiIndexInfoPage(condition string, pars []interface{}) (items []*Base
 		sql += condition
 	}
 	sql += ` ORDER BY fenwei_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 

models/data_manage/base_from_national_statistics_classify.go

@@ -86,7 +86,7 @@ func (m *BaseFromNationalStatisticsClassify) GetItemsByCondition(condition strin
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_national_statistics_data.go

@@ -84,7 +84,7 @@ func (m *BaseFromNationalStatisticsData) GetItemsByCondition(condition string, p
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_national_statistics_index.go

@@ -67,14 +67,14 @@ func (m *BaseFromNationalStatisticsIndex) GetItemByCondition(condition string, p
 	sql := `SELECT * FROM base_from_national_statistics_index WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -93,7 +93,7 @@ func (m *BaseFromNationalStatisticsIndex) GetItemsByCondition(condition string,
 		limit += fmt.Sprintf(` LIMIT %d`, limitNum)
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s %s`, fields, m.TableName(), condition, order, limit)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_oilchem.go

@@ -135,7 +135,7 @@ func GetOilchemIndexByCondition(condition string, pars []interface{}) (items []*
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_oilchem_index_id ASC`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ths_hf.go

@@ -11,9 +11,9 @@ import (
 
 // TODO:有时间还是放在配置里面吧...
 var (
-	ThsHfPeriodArr = []int{1, 3, 5, 10, 15, 30, 60}                                                                                                                                                          // 时间周期
-	ThsHfCPSArr    = []string{"no", "forward1", "forward2", "forward3", "forward4", "backward1", "backward2", "backward3", "backward4"}                                                                      // 复权方式
-	ThsHfFillArr   = []string{"Original", "Previous", "Blank"}                                                                                                                                               // 非交易间隔处理
+	ThsHfPeriodArr = []int{1, 3, 5, 10, 15, 30, 60}                                                                                                                                // 时间周期
+	ThsHfCPSArr    = []string{"no", "forward1", "forward2", "forward3", "forward4", "backward1", "backward2", "backward3", "backward4"}                                            // 复权方式
+	ThsHfFillArr   = []string{"Original", "Previous", "Blank"}                                                                                                                     // 非交易间隔处理
 	ThsHfEdbCodeCn = map[string]string{"open": "开盘价", "close": "收盘价", "high": "最高价", "low": "最低价", "avgprice": "均价", "volume": "成交价", "amt": "成交额", "pct_chg": "涨跌幅", "oi": "持仓量"} // 可选指标代码对应中文
 )
 
@@ -143,7 +143,7 @@ func (m *BaseFromThsHfIndex) RemoveByCondition(condition string, pars []interfac
 	}
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	err = o.Exec(sql, pars).Error
+	err = o.Exec(sql, pars...).Error
 
 	return
 }
@@ -163,7 +163,7 @@ func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -187,7 +187,7 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ths_hf_classify.go

@@ -150,7 +150,7 @@ func (m *BaseFromThsHfClassify) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -297,7 +297,7 @@ func UpdateThsHfClassifyChildByParentClassifyId(classifyIds []int, rootId int, l
 	pars = append(pars, classifyIds)
 	// 更新相关联的二级分类的parentId,和classify_name_second
 	sql := `update base_from_ths_hf_classify SET root_id = ?, level = level+? where base_from_ths_hf_classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	err = o.Exec(sql, pars).Error
+	err = o.Exec(sql, pars...).Error
 	if err != nil {
 		return
 	}

models/data_manage/base_from_ths_hf_data.go

@@ -123,7 +123,7 @@ func (m *BaseFromThsHfData) GetItemByCondition(condition string, pars []interfac
 func (m *BaseFromThsHfData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -139,7 +139,7 @@ func (m *BaseFromThsHfData) GetItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/ccf_stock_classify.go

@@ -94,7 +94,7 @@ func (m *CCFStockClassify) GetItemByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -102,7 +102,7 @@ func (m *CCFStockClassify) GetItemByCondition(condition string, pars []interface
 func (m *CCFStockClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -118,7 +118,7 @@ func (m *CCFStockClassify) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/ccf_stock_excel.go

@@ -114,7 +114,7 @@ func (m *CCFStockExcel) GetItemByCondition(condition string, pars []interface{},
 func (m *CCFStockExcel) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -130,7 +130,7 @@ func (m *CCFStockExcel) GetItemsByCondition(condition string, pars []interface{}
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_classify.go

@@ -230,7 +230,7 @@ func GetChartClassifyByCondition(condition string, pars []interface{}) (item *Ch
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/chart_edb_mapping.go

@@ -155,7 +155,7 @@ func GetRelationEdbInfoListCountByCondition(condition string, pars []interface{}
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -362,7 +362,7 @@ func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&item).Error
+	err = o.Raw(sql, pars...).Scan(&item).Error
 
 	return
 }

models/data_manage/chart_framework.go

@@ -98,14 +98,14 @@ func (m *ChartFramework) GetItemById(id int) (item *ChartFramework, err error) {
 
 func (m *ChartFramework) GetItemByCondition(condition string, pars []interface{}) (item *ChartFramework, err error) {
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }
 
 func (m *ChartFramework) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -121,7 +121,7 @@ func (m *ChartFramework) GetItemsByCondition(condition string, pars []interface{
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_framework_node.go

@@ -76,7 +76,7 @@ func (m *ChartFrameworkNode) GetItemByCondition(condition string, pars []interfa
 func (m *ChartFrameworkNode) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -92,7 +92,7 @@ func (m *ChartFrameworkNode) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_info.go

@@ -234,7 +234,7 @@ func GetChartInfoCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -402,7 +402,7 @@ func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartI
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/chart_info_correlation.go

@@ -79,7 +79,7 @@ func (m *ChartInfoCorrelation) GetItemById(id int) (err error) {
 func (m *ChartInfoCorrelation) GetItemByCondition(condition string, pars []interface{}) (err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).First(&m).Error
+	err = o.Raw(sql, pars...).First(&m).Error
 
 	return
 }
@@ -95,7 +95,7 @@ func (m *ChartInfoCorrelation) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/com_trade_data.go

@@ -65,7 +65,7 @@ func GetComTradeListCount(condition string, pars []interface{}) (count int, err
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/com_trade_index.go

@@ -23,7 +23,7 @@ func GetComTradeIndexList(condition string, pars []interface{}) (list []*ComTrad
 		sql += condition
 	}
 	sql += `ORDER BY com_trade_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 
 	return
 }

models/data_manage/data_manage_permission/edb.go

@@ -437,7 +437,7 @@ func GetPermissionEdbIdList(userId, edbInfoId int) (idList []int, err error) {
 		sql += ` AND edb_info_id = ? `
 		pars = append(pars, edbInfoId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&idList).Error
 
 	return
 }
@@ -465,7 +465,7 @@ func GetPermissionEdbClassifyIdList(userId, classifyId int) (idList []int, err e
 		sql += ` AND edb_classify_id = ? `
 		pars = append(pars, classifyId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&idList).Error
 	return
 }
 

models/data_manage/data_manage_permission/excel.go

@@ -330,7 +330,7 @@ func GetPermissionExcelIdList(userId, excelInfoId int) (idList []int, err error)
 		sql += ` AND excel_info_id = ? `
 		pars = append(pars, excelInfoId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&idList).Error
 
 	return
 }
@@ -350,7 +350,7 @@ func GetPermissionExcelClassifyIdList(userId, classifyId int) (idList []int, err
 		sql += ` AND excel_classify_id = ? `
 		pars = append(pars, classifyId)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&idList).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&idList).Error
 
 	return
 }

models/data_manage/edb_classify.go

@@ -618,7 +618,7 @@ func UpdateEdbClassifyChildByParentClassifyId(classifyIds []int, rootId int, lev
 	sql := `update edb_classify 
 SET root_id = ?, level = level+?
 where classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	err = global.DmSQL["data"].Exec(sql, pars).Error
+	err = global.DmSQL["data"].Exec(sql, pars...).Error
 	if err != nil {
 		return
 	}

models/data_manage/edb_data_base.go

@@ -357,7 +357,7 @@ func GetEdbDataAllByEdbCodeAndSubSource(edbCode string, source, subSource, limit
 		pars = append(pars, limit)
 	}
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -397,7 +397,7 @@ func GetEdbDataAllByEdbCodes(edbCodes []string, limit int) (items []*EdbInfoSear
 		sql += `  LIMIT ?  `
 		pars = append(pars, limit)
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/edb_info.go

@@ -354,7 +354,7 @@ func GetEdbInfoCountByCondition(condition string, pars []interface{}) (count int
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -488,7 +488,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}) (item *EdbInfoL
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&item).Error
+	err = o.Raw(sql, pars...).Scan(&item).Error
 
 	return
 }
@@ -501,7 +501,7 @@ func GetEdbDataCountByCondition(condition string, pars []interface{}, source, su
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -719,7 +719,7 @@ func GetEdbInfoFilter(condition string, pars []interface{}) (list []*EdbInfoList
 		sql += condition
 	}
 	sql += ` ORDER BY create_time DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }
@@ -744,7 +744,7 @@ func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1310,7 +1310,7 @@ func GetEdbInfoByConditionCount(condition string, pars []interface{}) (count int
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -1461,7 +1461,7 @@ func GetEdbInfoByClassifyId(classifyId, edbInfoType, adminId int) (items []*EdbC
 		pars = append(pars, adminId)
 	}
 	sql += ` order by sort asc,edb_info_id asc `
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1814,7 +1814,7 @@ func GetEdbInfoByClassifyIdAndSource(classifyId, edbInfoType, source int) (items
 
 	pars := []interface{}{classifyId, edbInfoType, source}
 	sql += ` order by sort asc,edb_info_id asc `
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1851,7 +1851,7 @@ func GetEdbInfoFieldList(cond string, pars []interface{}, fields []string) (item
 	}
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT %s FROM edb_info WHERE 1=1 %s `, field, cond)
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -1867,7 +1867,7 @@ func GetEdbInfoListByCond(condition string, pars []interface{}) (list []*EdbInfo
 		sql += condition
 	}
 	sql += ` ORDER BY create_time DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/data_manage/edb_info_updates.go

@@ -16,7 +16,7 @@ func GetUpdatesStatistical(condition string, pars []interface{}) (list []*Update
 			WHERE 1=1 `
 	sql += condition
 	sql += ` GROUP BY source  `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/data_manage/excel/excel_chart_edb.go

@@ -648,6 +648,6 @@ func GetBalanceChartEdbByCondition(condition string, pars []interface{}) (item *
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }

models/data_manage/excel/excel_classify.go

@@ -179,7 +179,7 @@ func GetExcelClassifyByCondition(condition string, pars []interface{}) (item *Ex
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -198,7 +198,7 @@ func GetNextExcelClassifyByCondition(condition string, pars []interface{}) (item
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , create_time ASC LIMIT 1 "
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 

models/data_manage/excel/excel_edb_mapping.go

@@ -241,6 +241,6 @@ func GetExcelEdbMappingItemByExcelInfoIdOrKeyword(excelInfoId int, keyword strin
 			%s
 		ORDER BY
 			b.excel_edb_mapping_id ASC`, cond)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/data_manage/excel/excel_info.go

@@ -329,7 +329,7 @@ func GetExcelInfoCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -376,7 +376,7 @@ func GetNoContentExcelInfoListByConditionNoPage(condition string, pars []interfa
 	}
 
 	sql += ` ORDER BY excel_info_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -395,7 +395,7 @@ func GetExcelInfoListByCondition(condition string, pars []interface{}) (items []
 		sql += condition
 	}
 	sql += ` ORDER BY sort asc, excel_info_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -414,7 +414,7 @@ func GetNextExcelInfoByCondition(condition string, pars []interface{}) (item *Ex
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , create_time desc LIMIT 1 "
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -591,7 +591,7 @@ func GetNoContentExcelListByConditionNoPage(condition string, pars []interface{}
 	}
 	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
 	sql += " ORDER BY create_time DESC"
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -607,7 +607,7 @@ func GetExcelListCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/data_manage/factor_edb_series.go

@@ -118,14 +118,14 @@ func (m *FactorEdbSeries) GetItemByCondition(condition string, pars []interface{
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars...).QueryRow(&item)
 	return
 }
 
 func (m *FactorEdbSeries) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).QueryRow(&count)
 	return
 }
 
@@ -140,7 +140,7 @@ func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	_, err = o.Raw(sql, pars...).QueryRows(&items)
 	return
 }
 

models/data_manage/future_good/chart_info_future_good_profit.go

@@ -66,7 +66,7 @@ func (m *ChartInfoFutureGoodProfit) GetItemById(id int) (err error) {
 
 func (m *ChartInfoFutureGoodProfit) GetItemByCondition(condition string, pars []interface{}) (err error) {
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
@@ -81,7 +81,7 @@ func (m *ChartInfoFutureGoodProfit) GetItemsByCondition(condition string, pars [
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/future_good/future_good_chart_classify.go

@@ -76,7 +76,7 @@ func GetFutureGoodChartClassifyByCondition(condition string, pars []interface{})
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&item).Error
 
 	return
 }
@@ -88,7 +88,7 @@ func GetNextFutureGoodChartClassifyByCondition(condition string, pars []interfac
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , create_time ASC LIMIT 1 "
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/future_good/future_good_edb_info.go

@@ -113,7 +113,7 @@ func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }
@@ -130,7 +130,7 @@ func GetFutureGoodEdbExchangeList(condition string, pars []interface{}) (list []
 		sql += condition
 	}
 	sql += ` GROUP BY exchange `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/data_manage/future_good/future_good_edb_info_data.go

@@ -60,7 +60,7 @@ func GetFutureGoodEdbDataListCount(condition string, pars []interface{}) (count
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/my_chart.go

@@ -47,7 +47,7 @@ func GetChartListCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -140,7 +140,7 @@ func GetMyChartClassifyCountByCondition(condition string, pars []interface{}) (c
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -605,7 +605,7 @@ func GetMyChartSearchByCondition(condition string, pars []interface{}) (item []*
 		sql += condition
 	}
 	sql += " GROUP BY a.chart_info_id ORDER BY c.sort DESC "
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -689,7 +689,7 @@ func GetMyChartByCondition(condition string, pars []interface{}) (item []*MyChar
 		sql += condition
 	}
 	sql += ` GROUP BY a.chart_info_id  `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -705,7 +705,7 @@ func GetMyChartDetailByCondition(condition string, pars []interface{}) (item *My
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -993,7 +993,7 @@ func GetCompanyPublicClassifyList(condition string, pars []interface{}) (item []
 	sql := ` SELECT * FROM my_chart_classify WHERE 1 = 1 AND is_public = 1 AND is_company_public = 1 `
 	sql += condition
 	sql += " ORDER BY public_time asc"
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -1131,7 +1131,7 @@ func GetMyChartListGroupByCharyInfoIdAndAdminIdByCondition(condition string, par
 		sql += condition
 	}
 	sql += " GROUP BY a.chart_info_id,a.admin_id ORDER BY c.sort DESC "
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -1174,7 +1174,7 @@ func GetRelationChartListCountByCondition(condition string, pars []interface{})
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -1278,6 +1278,6 @@ func GetMyChartClassifyIdAndNum(cond string, pars []interface{}) (items []*MyCha
 			1 = 1 %s
 		GROUP BY
 			a.my_chart_classify_id`, cond)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/data_manage/mysteel_chemical_index.go

@@ -200,7 +200,7 @@ func GetMysteelChemicalFrequency(condition string, pars []interface{}) (items []
 		sql += condition
 	}
 	sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -245,7 +245,7 @@ func GetMysteelChemicalIndex(condition string, pars []interface{}) (items []*Mys
 		sql += condition
 	}
 	sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -477,7 +477,7 @@ func GetMysteelChemicalIndexCount(condition string, pars []interface{}) (count i
 		sql += condition
 	}
 	sql += ` ORDER BY base_from_mysteel_chemical_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/data_manage/supply_analysis/variety.go

@@ -172,7 +172,7 @@ func (item Variety) GetListByPage(condition string, pars []interface{}, startSiz
 	baseSql += ` GROUP BY a.variety_id ) d `
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_source/guagnzhouqihuo.go

@@ -185,7 +185,7 @@ WHERE `
 		}
 		sql += ` ORDER BY a.index_code ASC `
 		//_, err = o.Raw(sql, pars).QueryRows(&list)
-		err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 		return
 	}
 }
@@ -201,6 +201,6 @@ WHERE `
 	}
 	sql += ` ORDER BY a.index_code ASC `
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/data_stat/edb_info_delete_log.go

@@ -77,8 +77,8 @@ type EdbInfoDeleteLog struct {
 	EdbNameEn          string  `gorm:"column:edb_name_en;type:varchar(255);default:''"`                  // 英文指标名称
 	UnitEn             string  `gorm:"column:unit_en;type:varchar(20);default:''"`                       // 英文单位
 	ChartImage         string  `gorm:"column:chart_image;type:varchar(255);default:''"`                  // 图表图片
-	Calendar           string  `gorm:"column:calendar;type:varchar(16);default:公历"`                    // 公历/农历
-	DataDateType       string  `gorm:"column:data_date_type;type:varchar(32);default:交易日"`            // 数据日期类型，枚举值：交易日、自然日
+	Calendar           string  `gorm:"column:calendar;type:varchar(16);default:公历"`                      // 公历/农历
+	DataDateType       string  `gorm:"column:data_date_type;type:varchar(32);default:交易日"`               // 数据日期类型，枚举值：交易日、自然日
 	ManualSave         int     `gorm:"column:manual_save;type:tinyint(4);not null;default:0"`            // 是否手动保存过上下限：0-否；1-是
 	TerminalCode       string  `gorm:"column:terminal_code;type:varchar(255);default:''"`                // 终端编码，用于配置在机器上
 	CreateTime         string  `gorm:"index:create_time_idx;column:create_time;type:datetime"`           // 创建时间
@@ -157,6 +157,6 @@ func GetEdbDeleteLogCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_update_log.go

@@ -141,6 +141,6 @@ func GetEdbUpdateLogCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_update_stat.go

@@ -184,6 +184,6 @@ WHERE
 	data_update_failed_reason
 	ORDER BY count(*) desc`
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }

models/data_stat/edb_source_stat.go

@@ -92,6 +92,6 @@ func GetEdbSourceStatCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/fe_calendar/fe_calendar_matter.go

@@ -184,7 +184,7 @@ func (m *FeCalendarMatter) GetItemsByCondition(condition string, pars []interfac
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/ppt_english/ppt_english.go

@@ -141,7 +141,7 @@ func GetPptEnglishListCount(condition string, pars []interface{}) (count int, er
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/report_approve/report_approve.go

@@ -321,7 +321,7 @@ func GetApprovingReportApproveCount(cond string, pars []interface{}) (count int,
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -351,7 +351,7 @@ func GetApprovedReportApproveCount(cond string, pars []interface{}) (count int,
 		WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/report_approve/report_approve_flow.go

@@ -131,7 +131,7 @@ func (m *ReportApproveFlow) GetItemByCondition(condition string, pars []interfac
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 

models/report_approve/report_approve_message.go

@@ -132,7 +132,7 @@ func (m *ReportApproveMessage) GetItemByCondition(condition string, pars []inter
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -156,7 +156,7 @@ func (m *ReportApproveMessage) GetItemsByCondition(condition string, pars []inte
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/report_approve/report_approve_node.go

@@ -127,7 +127,7 @@ func (m *ReportApproveNode) GetItemByCondition(condition string, pars []interfac
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -135,7 +135,7 @@ func (m *ReportApproveNode) GetCountByCondition(condition string, pars []interfa
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -151,7 +151,7 @@ func (m *ReportApproveNode) GetItemsByCondition(condition string, pars []interfa
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/report_approve/report_approve_record.go

@@ -166,7 +166,7 @@ func (m *ReportApproveRecord) GetItemByCondition(condition string, pars []interf
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -174,7 +174,7 @@ func (m *ReportApproveRecord) GetCountByCondition(condition string, pars []inter
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -190,7 +190,7 @@ func (m *ReportApproveRecord) GetItemsByCondition(condition string, pars []inter
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -276,7 +276,7 @@ func (m *ReportApproveRecord) UpdateNodeState(reportApproveId, nodeId, nodeState
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`UPDATE %s SET node_state=?,node_approve_user_id=?,node_approve_user_name=?,node_approve_time=? WHERE report_approve_id = ? AND node_id = ?`, m.TableName())
 	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, pars).Error
+	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }
 

models/sandbox/sandbox.go

@@ -222,7 +222,7 @@ func GetList(condition string, pars []interface{}, startSize, pageSize int) (tot
 	sql += ` order by a.modify_time desc,a.sandbox_id desc`
 
 	totalSql := `select count(1) total from (` + sql + `) z `
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	//err = o.Raw(totalSql, pars).QueryRow(&total)
 	if err != nil {
 		return
@@ -322,7 +322,7 @@ func GetSandboxListCountByCondition(condition string, pars []interface{}) (count
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/sandbox/sandbox_version.go

@@ -121,7 +121,7 @@ func GetVersionList(condition string, pars []interface{}, startSize, pageSize in
 
 	totalSql := `select count(1) total from (` + sql + `) z `
 	//err = o.Raw(totalSql, pars).QueryRow(&total)
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/semantic_analysis/sa_compare.go

@@ -103,7 +103,7 @@ func (m *SaCompare) GetItemByCondition(condition string, pars []interface{}) (er
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -111,7 +111,7 @@ func (m *SaCompare) GetCountByCondition(condition string, pars []interface{}) (c
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -127,7 +127,7 @@ func (m *SaCompare) GetItemsByCondition(condition string, pars []interface{}, fi
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -146,7 +146,7 @@ func (m *SaCompare) GetPageItemsByCondition(startSize, pageSize int, condition s
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	//	return
 	//}
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/semantic_analysis/sa_compare_classify.go

@@ -86,7 +86,7 @@ func (m *SaCompareClassify) GetItemByCondition(condition string, pars []interfac
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -94,7 +94,7 @@ func (m *SaCompareClassify) GetCountByCondition(condition string, pars []interfa
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -110,7 +110,7 @@ func (m *SaCompareClassify) GetItemsByCondition(condition string, pars []interfa
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -129,7 +129,7 @@ func (m *SaCompareClassify) GetPageItemsByCondition(startSize, pageSize int, con
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	//	return
 	//}
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/semantic_analysis/sa_compare_doc.go

@@ -90,7 +90,7 @@ func (m *SaCompareDoc) GetItemsByCondition(condition string, pars []interface{},
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/semantic_analysis/sa_compare_label.go

@@ -112,7 +112,7 @@ func (m *SaCompareLabel) GetItemByCondition(condition string, pars []interface{}
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -120,7 +120,7 @@ func (m *SaCompareLabel) GetCountByCondition(condition string, pars []interface{
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -135,7 +135,7 @@ func (m *SaCompareLabel) GetGroupCountByCondition(condition string, pars []inter
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) AS use_num, %s FROM %s WHERE 1=1 %s GROUP BY %s`, groupRule, m.TableName(), condition, groupRule)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -151,7 +151,7 @@ func (m *SaCompareLabel) GetItemsByCondition(condition string, pars []interface{
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -170,7 +170,7 @@ func (m *SaCompareLabel) GetPageItemsByCondition(startSize, pageSize int, condit
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	//	return
 	//}
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -228,6 +228,6 @@ func GetSaCompareLabelByCond(condition string, pars []interface{}) (items []*SaC
 				c.sort ASC`
 	sql = fmt.Sprintf(sql, condition)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/semantic_analysis/sa_compare_search_keyword.go

@@ -79,7 +79,7 @@ func (m *SaCompareSearchKeyword) GetItemByCondition(condition string, pars []int
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -87,7 +87,7 @@ func (m *SaCompareSearchKeyword) GetCountByCondition(condition string, pars []in
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -103,7 +103,7 @@ func (m *SaCompareSearchKeyword) GetItemsByCondition(condition string, pars []in
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -122,7 +122,7 @@ func (m *SaCompareSearchKeyword) GetPageItemsByCondition(startSize, pageSize int
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	//	return
 	//}
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/semantic_analysis/sa_doc.go

@@ -111,7 +111,7 @@ func (m *SaDoc) GetItemByCondition(condition string, pars []interface{}) (err er
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -119,7 +119,7 @@ func (m *SaDoc) GetCountByCondition(condition string, pars []interface{}) (count
 	//// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -135,7 +135,7 @@ func (m *SaDoc) GetItemsByCondition(condition string, pars []interface{}, fieldA
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -154,7 +154,7 @@ func (m *SaDoc) GetPageItemsByCondition(startSize, pageSize int, condition strin
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	//	return
 	//}
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -439,7 +439,7 @@ func GetSaDocsWithUseNumByCondition(condition string, pars []interface{}) (items
 			    a.sort ASC, a.create_time DESC, a.sa_doc_id ASC`
 	sql = fmt.Sprintf(sql, condition)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/semantic_analysis/sa_doc_classify.go

@@ -90,7 +90,7 @@ func (m *SaDocClassify) GetItemByCondition(condition string, pars []interface{})
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -98,7 +98,7 @@ func (m *SaDocClassify) GetCountByCondition(condition string, pars []interface{}
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -114,7 +114,7 @@ func (m *SaDocClassify) GetItemsByCondition(condition string, pars []interface{}
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -133,7 +133,7 @@ func (m *SaDocClassify) GetPageItemsByCondition(startSize, pageSize int, conditi
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	//	return
 	//}
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/semantic_analysis/sa_doc_section.go

@@ -76,7 +76,7 @@ func (m *SaDocSection) GetItemByCondition(condition string, pars []interface{})
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -84,7 +84,7 @@ func (m *SaDocSection) GetCountByCondition(condition string, pars []interface{})
 	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -100,7 +100,7 @@ func (m *SaDocSection) GetItemsByCondition(condition string, pars []interface{},
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -119,7 +119,7 @@ func (m *SaDocSection) GetPageItemsByCondition(startSize, pageSize int, conditio
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
 	//	return
 	//}
-	err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/semantic_analysis/sa_label.go

@@ -86,7 +86,7 @@ func (m *SaLabel) GetItemByCondition(condition string, pars []interface{}) (err
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&m)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&m).Error
 	return
 }
 
@@ -94,7 +94,7 @@ func (m *SaLabel) GetCountByCondition(condition string, pars []interface{}) (cou
 	// o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }