Browse Source

no message

xingzai 6 months ago
parent
commit
f91ff8cefd

+ 5 - 4
models/business_conf.go

@@ -92,7 +92,7 @@ func (m *BusinessConf) GetItemByCondition(condition string, pars []interface{})
 	//err = o.Raw(sql, pars).QueryRow(&item)
 
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = global.DmSQL["eta"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["eta"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -102,7 +102,7 @@ func (m *BusinessConf) GetCountByCondition(condition string, pars []interface{})
 	//err = o.Raw(sql, pars).QueryRow(&count)
 
 	sql := fmt.Sprintf(`SELECT COUNT(1) AS count FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DmSQL["eta"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["eta"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -128,7 +128,7 @@ func (m *BusinessConf) 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 = global.DmSQL["eta"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["eta"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -154,7 +154,8 @@ func (m *BusinessConf) GetPageItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["eta"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DmSQL["eta"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

+ 1 - 1
models/data_manage/base_from_smm.go

@@ -194,6 +194,6 @@ func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }

+ 7 - 5
models/data_manage/base_from_ths_hf_index.go

@@ -144,7 +144,7 @@ func (m *BaseFromThsHfIndex) RemoveByCondition(condition string, pars []interfac
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
 	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 
@@ -164,7 +164,7 @@ func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interfa
 	}
 	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.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -172,7 +172,7 @@ func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interf
 	//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
 }
 
@@ -188,7 +188,7 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 	}
 	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
 }
 
@@ -204,6 +204,8 @@ func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []in
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }

+ 1 - 1
models/data_manage/chart_edb_mapping.go

@@ -113,6 +113,6 @@ func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface
 		sql += condition
 	}
 	//_, 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
 }

+ 1 - 1
models/data_manage/edb_classify.go

@@ -39,6 +39,6 @@ func GetAllEdbClassifyListByCondition(condition string, pars []interface{}) (ite
 	}
 	sql += `ORDER BY classify_id ASC `
 	//_, 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
 }

+ 1 - 1
models/data_manage/edb_data_cffex.go

@@ -191,7 +191,7 @@ func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*Base
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_data_dl.go

@@ -168,7 +168,7 @@ func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_data_gl.go

@@ -39,7 +39,7 @@ func GetGlDataByTradeCode(condition string, pars []interface{}) (item []*GlData,
 
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DmSQL["gl"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["gl"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_data_lz.go

@@ -54,7 +54,7 @@ func GetLzSurveyDataByTradeCode(condition string, pars []interface{}) (item []*l
 	sql += ` ORDER BY a.data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_data_manual.go

@@ -41,7 +41,7 @@ func GetEdbdataManualByTradeCode(condition string, pars []interface{}) (item []*
 	sql += ` ORDER BY DT DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_data_sh.go

@@ -192,7 +192,7 @@ func GetShDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_data_shfe.go

@@ -190,7 +190,7 @@ func GetShfeDataByTradeCode(condition string, pars []interface{}) (item []*BaseF
 	}
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_data_zz.go

@@ -166,7 +166,7 @@ func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFro
 	sql += ` ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 

+ 7 - 7
models/data_manage/edb_info.go

@@ -77,7 +77,7 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -147,7 +147,7 @@ func GetEdbDataListAll(condition string, pars []interface{}, source, subSource,
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -168,7 +168,7 @@ func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -265,7 +265,7 @@ func GetAllEdbInfoClassifyListByCondition(condition string, pars []interface{})
 	sql += `ORDER BY edb_info_id ASC `
 	//_, 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
 }
 
@@ -319,8 +319,8 @@ func GetEdbInfoPageByCondition(condition string, pars []interface{}, startPage,
 	}
 	sql += ` LIMIT ?,? `
 	//_, err = o.Raw(sql, pars, startPage, pageSize).QueryRows(&item)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars, startPage, pageSize).Find(&item).Error
+	pars = append(pars, startPage, pageSize)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -332,7 +332,7 @@ func GetEdbInfoCountByCondition(condition string, pars []interface{}) (total int
 	}
 	//err = o.Raw(sql, pars).QueryRow(&total)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&total).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&total).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_info_update_log.go

@@ -46,6 +46,6 @@ func GetEdbInfoUpdateLogByCondition(condition string, pars []interface{}) (item
 	}
 	sql += `ORDER BY id ASC limit 0,10  `
 	//_, 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
 }

+ 1 - 1
models/data_manage/edb_refresh/edb_refresh_config.go

@@ -86,6 +86,6 @@ func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (l
 	}
 	sql += ` ORDER BY edb_refresh_config_id 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
 }

+ 1 - 1
models/data_manage/edb_refresh/edb_refresh_default_config.go

@@ -110,7 +110,7 @@ func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefres
 	}
 	sql += ` ORDER BY id 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
 }

+ 1 - 1
models/data_manage/edb_refresh/edb_refresh_mapping.go

@@ -120,6 +120,6 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		pars = append(pars, sourceList)
 	}
 	//_, 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
 }

+ 2 - 2
models/data_manage/edb_source.go

@@ -42,7 +42,7 @@ func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr
 	sql := fmt.Sprintf(`SELECT %s FROM edb_source WHERE 1=1 %s %s`, fields, 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
 }
 
@@ -52,7 +52,7 @@ func GetEdbSourceItemByCondition(condition string, pars []interface{}) (item *Ed
 	sql := fmt.Sprintf(`SELECT * FROM edb_source WHERE 1=1 %s`, condition)
 	//err = o.Raw(sql, pars).QueryRow(&item)
 
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 

+ 1 - 1
models/data_manage/edb_update_log.go

@@ -64,7 +64,7 @@ func GetEdbUpdateLogByCondition(condition string, pars []interface{}) (item []*E
 	}
 	sql += ` ORDER BY id ASC limit 500 `
 	//_, 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
 }
 

+ 5 - 5
models/data_manage/factor_edb_series_chart_mapping.go

@@ -131,7 +131,7 @@ func (m *FactorEdbSeriesChartMapping) GetItemByCondition(condition string, pars
 	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.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -140,7 +140,7 @@ func (m *FactorEdbSeriesChartMapping) GetCountByCondition(condition string, pars
 	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
 }
 
@@ -157,7 +157,7 @@ func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars
 	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
 }
 
@@ -173,8 +173,8 @@ func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string,
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

+ 6 - 6
models/data_manage/factor_edb_series_mapping.go

@@ -102,7 +102,7 @@ func (m *FactorEdbSeriesMapping) RemoveByCondition(condition string, pars []inte
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
 	//_, err = o.Raw(sql, pars).Exec()
 
-	err = global.DEFAULT_DmSQL.Exec(sql, pars).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, pars...).Error
 	return
 }
 
@@ -124,7 +124,7 @@ func (m *FactorEdbSeriesMapping) GetItemByCondition(condition string, pars []int
 	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.DEFAULT_DmSQL.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -133,7 +133,7 @@ func (m *FactorEdbSeriesMapping) GetCountByCondition(condition string, pars []in
 	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
 }
 
@@ -149,7 +149,7 @@ func (m *FactorEdbSeriesMapping) 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
 }
 
@@ -165,8 +165,8 @@ func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-
-	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

+ 2 - 2
models/data_manage/future_good/future_good_edb_info.go

@@ -44,7 +44,7 @@ func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*Fut
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -105,7 +105,7 @@ func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list [
 	sql += ` ORDER BY future_good_edb_info_id DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
 
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 	return
 }
 

+ 4 - 3
models/fe_calendar/fe_calendar_matter.go

@@ -97,7 +97,7 @@ func (m *FeCalendarMatter) 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 = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -107,7 +107,7 @@ func (m *FeCalendarMatter) GetCountByCondition(condition string, pars []interfac
 	//err = o.Raw(sql, pars).QueryRow(&count)
 
 	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
 }
 
@@ -133,6 +133,7 @@ func (m *FeCalendarMatter) GetPageItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }

+ 3 - 2
models/sandbox/sandbox.go

@@ -55,7 +55,8 @@ func GetSandboxListByCondition(condition string, pars []interface{}, startSize,
 		sql += condition
 	}
 	sql += " ORDER BY create_time DESC LIMIT ?,? "
-	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Find(&item).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -71,7 +72,7 @@ func GetSandboxListCountByCondition(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
 }