fix

models/classify_menu.go

@@ -22,6 +22,6 @@ func GetClassifyMenuList(condition string, pars []interface{}) (list []*Classify
 	sql := `SELECT * FROM classify_menu WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY sort ASC, create_time ASC`
-	err = global.DbMap[utils.DbNameReport].Raw(sql, pars).Find(&list).Error
+	err = global.DbMap[utils.DbNameReport].Raw(sql, pars...).Find(&list).Error
 	return
 }

models/classify_menu_relation.go

@@ -46,7 +46,7 @@ func GetClassifyMenuRelationList(condition string, pars []interface{}) (list []*
 	sql := `SELECT * FROM classify_menu_relation WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY create_time DESC`
-	err = global.DbMap[utils.DbNameReport].Raw(sql, pars).Find(&list).Error
+	err = global.DbMap[utils.DbNameReport].Raw(sql, pars...).Find(&list).Error
 	return
 }
 

models/data_manage/base_from_business.go

@@ -65,6 +65,7 @@ func (m *BaseFromBusinessIndex) GetItemsByCondition(cond string, pars []interfac
 	}
 	sql = fmt.Sprintf(`SELECT %s FROM base_from_business_index WHERE 1=1 %s %s limit ?,?`, fields, cond, order)
 	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/en_classify_permission.go

@@ -66,14 +66,14 @@ func (m *EnClassifyPermission) GetItemByCondition(condition string, pars []inter
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 `, m.TableName())
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Scan(&item).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Scan(&item).Error
 	return
 }
 
 func (m *EnClassifyPermission) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Scan(&count).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -88,7 +88,7 @@ func (m *EnClassifyPermission) 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 = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Find(&items).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -104,11 +104,12 @@ func (m *EnClassifyPermission) GetPageItemsByCondition(startSize, pageSize int,
 	}
 	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 = global.DbMap[utils.MYSQL_URL_RDDP].Raw(totalSql, pars).Scan(&total).Error; err != nil {
+	if err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/english_report.go

@@ -61,7 +61,7 @@ func (m *EnglishReport) GetItemById(id int) (item *EnglishReport, err error) {
 func (m *EnglishReport) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM english_report WHERE 1=1 %s`, condition)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Scan(&count).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -76,7 +76,7 @@ func (m *EnglishReport) GetItemsByCondition(condition string, pars []interface{}
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM english_report WHERE 1=1 %s %s`, fields, condition, order)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Find(&items).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -91,7 +91,10 @@ func (m *EnglishReport) GetPageItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM english_report WHERE 1=1 %s %s LIMIT ?,?`, fields, condition, order)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+
+	pars = append(pars, startSize, pageSize)
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
+
 	return
 }
 
@@ -265,7 +268,7 @@ FROM
 	WHERE a.parent_id>0 and a.classify_name LIKE ? and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
 		pars = append(pars, utils.GetLikeKeyword(keyword))
 		pars = append(pars, rootIds)
-		err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Find(&items).Error
+		err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
 	} else {
 		sql = `SELECT * FROM english_classify WHERE parent_id>0 and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
 		err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, rootIds).Find(&items).Error

models/report.go

@@ -114,7 +114,7 @@ func GetReportListCount(condition string, pars []interface{}, companyType string
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Scan(&count).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -125,7 +125,9 @@ func GetReportList(condition string, pars []interface{}, startSize, pageSize int
 		sql += condition
 	}
 	sql += `ORDER BY FIELD(state,3,1,4,5,6,2), modify_time DESC LIMIT ?,?`
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
+
 	return
 }
 
@@ -434,9 +436,10 @@ func GetReportByCondition(condition string, pars []interface{}, fieldArr []strin
 	sql += order
 	if isPage {
 		sql += ` LIMIT ?,?`
-		err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+		pars = append(pars, startSize, pageSize)
+		err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
 	} else {
-		err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Find(&items).Error
+		err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
 	}
 	return
 }

models/smart_report.go

@@ -114,14 +114,14 @@ func (m *SmartReport) GetItemByCondition(condition string, pars []interface{}, o
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Find(&item).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func (m *SmartReport) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Find(&count).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&count).Error
 	return
 }
 
@@ -136,7 +136,7 @@ func (m *SmartReport) 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.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Find(&items).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -151,7 +151,10 @@ func (m *SmartReport) GetPageItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+
+	pars = append(pars, startSize, pageSize)
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
+
 	return
 }
 

models/smart_resource.go

@@ -66,7 +66,7 @@ type SmartReportResourceListResp struct {
 func (m *SmartReportResource) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars).Scan(&count).Error
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -79,7 +79,9 @@ func (m *SmartReportResource) GetPageItemsByCondition(condition string, pars []i
 	order := ` ORDER BY create_time DESC`
 
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DbMap[utils.MYSQL_URL_RDDP].Raw(sql, pars...).Find(&items).Error
+
 	return
 }