|
@@ -214,17 +214,19 @@ func GetClassifyList(startSize, pageSize int, keyWord, companyType string, hideD
|
|
|
} else if companyType == "权益" {
|
|
|
companyTypeSqlStr = " AND (id = 40 or parent_id = 40) "
|
|
|
}
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
if keyWord != "" {
|
|
|
sql = `SELECT * FROM (
|
|
|
SELECT * FROM classify
|
|
|
- WHERE parent_id=0 ` + companyTypeSqlStr + ` AND classify_name LIKE '%` + keyWord + `%'
|
|
|
+ WHERE parent_id=0 ` + companyTypeSqlStr + ` AND classify_name LIKE ?
|
|
|
UNION
|
|
|
SELECT * FROM classify
|
|
|
- WHERE id IN(SELECT parent_id FROM classify
|
|
|
- WHERE parent_id>0 ` + companyTypeSqlStr + ` AND classify_name LIKE '%` + keyWord + `%')
|
|
|
+ WHERE id IN( SELECT parent_id FROM classify
|
|
|
+ WHERE parent_id>0 ` + companyTypeSqlStr + ` AND classify_name LIKE ? )
|
|
|
)AS t
|
|
|
ORDER BY sort ASC,create_time ASC
|
|
|
LIMIT ?,? `
|
|
|
+ pars = utils.GetLikeKeywordPars(pars, keyWord, 2)
|
|
|
} else {
|
|
|
sql = `SELECT * FROM classify WHERE parent_id=0 ` + companyTypeSqlStr
|
|
|
if hideDayWeek == 1 {
|
|
@@ -232,8 +234,10 @@ func GetClassifyList(startSize, pageSize int, keyWord, companyType string, hideD
|
|
|
}
|
|
|
sql += ` ORDER BY sort ASC, create_time ASC LIMIT ?,? `
|
|
|
}
|
|
|
+ pars = append(pars, startSize, pageSize)
|
|
|
+
|
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
|
- _, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
|
|
|
+ _, err = o.Raw(sql, pars...).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -246,16 +250,19 @@ func GetClassifyListCount(keyWord, companyType string, hideDayWeek int) (count i
|
|
|
} else if companyType == "权益" {
|
|
|
companyTypeSqlStr = " AND (id = 40 or parent_id = 40) "
|
|
|
}
|
|
|
+
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
+
|
|
|
if keyWord != "" {
|
|
|
sqlCount = `SELECT COUNT(1) AS count FROM (
|
|
|
SELECT * FROM classify
|
|
|
- WHERE parent_id=0 ` + companyTypeSqlStr + ` AND classify_name LIKE '%` + keyWord + `%'
|
|
|
+ WHERE parent_id=0 ` + companyTypeSqlStr + ` AND classify_name LIKE ?
|
|
|
UNION
|
|
|
SELECT * FROM classify
|
|
|
WHERE id IN(SELECT parent_id FROM classify
|
|
|
- WHERE parent_id>0 ` + companyTypeSqlStr + ` AND classify_name LIKE '%` + keyWord + `%')
|
|
|
+ WHERE parent_id>0 ` + companyTypeSqlStr + ` AND classify_name LIKE ? )
|
|
|
)AS t `
|
|
|
-
|
|
|
+ pars = utils.GetLikeKeywordPars(pars, keyWord, 2)
|
|
|
} else {
|
|
|
sqlCount = `SELECT COUNT(1) AS count FROM classify WHERE parent_id=0 ` + companyTypeSqlStr
|
|
|
if hideDayWeek == 1 {
|
|
@@ -263,7 +270,7 @@ func GetClassifyListCount(keyWord, companyType string, hideDayWeek int) (count i
|
|
|
}
|
|
|
}
|
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
|
- err = o.Raw(sqlCount).QueryRow(&count)
|
|
|
+ err = o.Raw(sqlCount, pars...).QueryRow(&count)
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -292,12 +299,16 @@ type FindByIdClassifyReq struct {
|
|
|
func GetClassifyChild(parentId int, keyWord string) (items []*Classify, err error) {
|
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
|
sql := ``
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
if keyWord != "" {
|
|
|
- sql = `SELECT * FROM classify WHERE parent_id=? AND classify_name LIKE '%` + keyWord + `%' ORDER BY create_time ASC `
|
|
|
+ sql = `SELECT * FROM classify WHERE classify_name LIKE ? AND parent_id=? ORDER BY create_time ASC `
|
|
|
+ pars = append(pars, utils.GetLikeKeyword(keyWord))
|
|
|
} else {
|
|
|
sql = `SELECT * FROM classify WHERE parent_id=? ORDER BY create_time ASC `
|
|
|
}
|
|
|
- _, err = o.Raw(sql, parentId).QueryRows(&items)
|
|
|
+ pars = append(pars, parentId)
|
|
|
+ _, err = o.Raw(sql, pars...).QueryRows(&items)
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -308,12 +319,16 @@ func GetClassifyChildByParentIds(parentId []int, keyWord string) (items []*Class
|
|
|
}
|
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
|
sql := ``
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
+ pars = append(pars, parentId)
|
|
|
if keyWord != "" {
|
|
|
- sql = `SELECT * FROM classify WHERE parent_id IN (` + utils.GetOrmInReplace(parentIdLen) + `) AND classify_name LIKE '%` + keyWord + `%' ORDER BY create_time ASC `
|
|
|
+ sql = `SELECT * FROM classify WHERE parent_id IN (` + utils.GetOrmInReplace(parentIdLen) + `) AND classify_name LIKE ? ORDER BY create_time ASC `
|
|
|
+ pars = append(pars, utils.GetLikeKeyword(keyWord))
|
|
|
} else {
|
|
|
sql = `SELECT * FROM classify WHERE parent_id IN (` + utils.GetOrmInReplace(parentIdLen) + `) ORDER BY create_time ASC `
|
|
|
}
|
|
|
- _, err = o.Raw(sql, parentId).QueryRows(&items)
|
|
|
+ _, err = o.Raw(sql, pars...).QueryRows(&items)
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|