orm->grom

models/cloud_disk_menu.go

@@ -55,7 +55,7 @@ func (m *CloudDiskMenu) 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
 }
 

models/cloud_disk_resource.go

@@ -84,7 +84,7 @@ func (m *CloudDiskResource) GetItemByCondition(condition string, pars []interfac
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
 	//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
 }
 
@@ -183,7 +183,9 @@ func GetCloudDiskMenuAndResourceList(menuCond, resourceCond string, menuPars, re
 	}
 	sql := fmt.Sprintf(base, menuCond, resourceCond, order)
 	//_, err = o.Raw(sql, menuPars, resourcePars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, menuPars, resourcePars).Find(&items).Error
+	pars := append(menuPars, resourcePars...)
+	//err = global.DEFAULT_DmSQL.Raw(sql, menuPars, resourcePars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/en_classify_permission.go

@@ -71,7 +71,7 @@ func (m *EnClassifyPermission) GetItemByCondition(condition string, pars []inter
 	sql += condition
 	sql += ` LIMIT 1`
 	//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
 }
 
@@ -79,7 +79,7 @@ func (m *EnClassifyPermission) GetCountByCondition(condition string, pars []inte
 	//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
 }
 
@@ -95,7 +95,7 @@ func (m *EnClassifyPermission) 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
 }
 
@@ -116,7 +116,7 @@ func (m *EnClassifyPermission) GetPageItemsByCondition(startSize, pageSize int,
 	//}
 	//sql += ` LIMIT ?,?`
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-	if err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`

models/en_permission.go

@@ -83,7 +83,7 @@ func (m *EnPermission) GetItemByCondition(condition string, pars []interface{})
 	sql += condition
 	sql += ` LIMIT 1`
 	//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
 }
 
@@ -91,7 +91,7 @@ func (m *EnPermission) GetCountByCondition(condition string, pars []interface{})
 	//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
 }
 
@@ -107,7 +107,7 @@ func (m *EnPermission) 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.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -124,7 +124,7 @@ func (m *EnPermission) GetPageItemsByCondition(startSize, pageSize int, conditio
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -198,7 +198,9 @@ func GetEnPermissionUnionList(condition string, pars []interface{}) (items []*En
 			sort ASC,
 			create_time ASC`, condition, condition)
 	//_, err = o.Raw(sql, pars, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars, pars).Find(&items).Error
+	pars = append(pars, pars...)
+	//	err = global.DmSQL["rddp"].Raw(sql, pars, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/en_video_cover.go

@@ -55,7 +55,7 @@ func GetEnglishVideoCoverPageList(condition string, pars []interface{}, orderRul
 	sql += orderRule
 	totalSQL := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQL, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQL, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQL, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`

models/english_company.go

@@ -192,7 +192,7 @@ WHERE
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -230,7 +230,7 @@ func GetEnglishCompanyList(condition string, pars []interface{}, order string) (
 		sql += ` ORDER BY create_time DESC`
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/english_policy_report.go

@@ -115,7 +115,7 @@ func GetEnglishPolicyReportListCount(condition string, pars []interface{}) (coun
 		sql += condition
 	}
 	//	err = oRddp.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
 }
 
@@ -143,7 +143,7 @@ func GetEnglishPolicyReportByCondition(condition string, pars []interface{}) (it
 		sql += condition
 	}
 	//_, 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/english_report.go

@@ -513,7 +513,7 @@ FROM
 		pars = append(pars, utils.GetLikeKeyword(keyword))
 		pars = append(pars, rootIds)
 		//_, 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
 	} else {
 		sql = `SELECT * FROM english_classify WHERE parent_id>0  ` + cond + ` and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
 		//_, err = o.Raw(sql, rootIds).QueryRows(&items)
@@ -562,7 +562,7 @@ func ModifyEnglishReportAuthor(condition string, pars []interface{}, authorName
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, authorName, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, authorName, pars...).Scan(&count).Error
 	return
 }
 

models/english_report_email.go

@@ -134,7 +134,7 @@ WHERE a.is_deleted = 0 `
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -156,7 +156,7 @@ func GetEnglishReportEmailList(condition string, pars []interface{}, order strin
 		sql += ` ORDER BY create_time DESC`
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -220,7 +220,7 @@ func GetEnglishCompanyViewPageList(condition string, pars []interface{}, order s
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -292,7 +292,7 @@ b.company_name AS company_name,a.company_name AS register_company_name FROM engl
 		sql += ` ORDER BY create_time DESC`
 	}
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/english_report_email_log.go

@@ -105,7 +105,7 @@ func GetEnglishReportEmailLogPageList(condition string, pars []interface{}, orde
 	}
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
@@ -160,7 +160,7 @@ func GetEnglishReportEmailLog(condition string, pars []interface{}) (item *Engli
 	sql += condition
 	sql += ` ORDER BY id DESC LIMIT 1`
 	//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/english_report_email_pv.go

@@ -71,7 +71,7 @@ func GetEnglishReportEmailPvPageList(condition string, pars []interface{}, start
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` ORDER BY recent_click_time DESC LIMIT ?,?`
@@ -100,7 +100,7 @@ func GetEnglishReportEmailUvPageList(condition string, pars []interface{}, start
 
 	totalSQl := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
-	if err = global.DmSQL["rddp"].Raw(totalSQl, pars).Scan(&total).Error; err != nil {
+	if err = global.DmSQL["rddp"].Raw(totalSQl, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` ORDER BY recent_click_time DESC LIMIT ?,?`

models/english_video.go

@@ -199,7 +199,7 @@ func GetEnglishVideoListCount(condition string, pars []interface{}) (count int,
 		sql += condition
 	}
 	//err = oRddp.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
 }
 
@@ -227,7 +227,7 @@ func GetEnglishVideoByCondition(condition string, pars []interface{}) (items []*
 		sql += condition
 	}
 	//_, 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/manual_edb.go

@@ -119,7 +119,7 @@ func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize in
 	}
 
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["edb"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -140,7 +140,7 @@ func GetCountEdbInfoList(condition string, pars []interface{}) (total int, err e
 	sql += ` ORDER BY a.create_date DESC `
 
 	//err = o.Raw(sql, pars).QueryRow(&total)
-	err = global.DmSQL["edb"].Raw(sql, pars).Scan(&total).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Scan(&total).Error
 	return
 }
 
@@ -382,7 +382,7 @@ func GetManualEdbCountByCondition(condition string, pars []interface{}) (count i
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["edb"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/report_chapter.go

@@ -530,7 +530,7 @@ func (chapterChapterInfo *ReportChapter) UpdateReportChapterSortByReportId(repor
 	}
 
 	//_, err = o.Raw(sql, pars).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, pars).Error
+	err = global.DmSQL["rddp"].Exec(sql, pars...).Error
 	return
 }
 
@@ -610,6 +610,6 @@ func GetCountReportChapterByCondition(condition string, pars []interface{}) (cou
 		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_chapter_ticker.go

@@ -70,6 +70,6 @@ func GetDailyBaseColumnList(keyword string, typeId int) (list []*DailyBaseColumn
 	pars = append(pars, typeId)
 	sql += ` AND report_chapter_type_id = ? `
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["weekly"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["weekly"].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/report_chapter_type.go

@@ -141,7 +141,7 @@ func GetAllReportChapterTypeList(condition string, pars []interface{}) (list []*
 	sql := ` SELECT * FROM report_chapter_type WHERE 1=1 `
 	sql += condition
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -341,7 +341,7 @@ func GetReportChapterTypeCount(condition string, pars []interface{}) (count int,
 	sql := ` SELECT COUNT(1) FROM report_chapter_type WHERE 1 = 1 `
 	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
 }
 
@@ -352,7 +352,7 @@ func GetReportChapterTypePageList(condition string, pars []interface{}) (list []
 	sql += condition
 	sql += ` ORDER BY sort ASC, created_time DESC`
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&list).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -427,7 +427,7 @@ func GetReportChapterTypeByCondition(condition string, pars []interface{}) (item
 	sql += condition
 	sql += ` LIMIT 1`
 	//err = o.Raw(sql, pars).QueryRow(&item)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&item).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&item).Error
 	return
 }
 

models/report_v2.go

@@ -367,7 +367,7 @@ func GetReportListCountByAuthorized(condition string, pars []interface{}) (count
 	}
 
 	//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
 }
 
@@ -431,7 +431,7 @@ func ModifyReportClassifyAndReportChapterTypeByCondition(condition string, pars
 		sql += condition
 	}
 	//_, err = to.Raw(sql, pars).Exec()
-	err = to.Exec(sql, pars).Error
+	err = to.Exec(sql, pars...).Error
 	if err != nil {
 		return
 	}