|
@@ -522,6 +522,7 @@ func HandleActivitySpecialShow(activityDetail *models.CygxActivitySpecialDetail,
|
|
|
func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, startSize, pageSize int, keywords string) (items []*models.ActivityDetail, total int, err error) {
|
|
|
var conditionSpecil string
|
|
|
var pars, parsSpecil []interface{}
|
|
|
+ keyword := keywords
|
|
|
if keywords != "" {
|
|
|
keywords = "%" + keywords + "%"
|
|
|
conditionSpecil += ` AND art.days > 0 AND (art.research_theme LIKE ? OR art.label LIKE ? OR art.industrial_name LIKE ? OR art.industrial_subject_name LIKE ? ) `
|
|
@@ -532,8 +533,9 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
|
|
|
err = errors.New("GetActivitySpecialSearcheList, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
// 查询IK分词后那一部分的数据
|
|
|
- conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keywords, 0, 2)
|
|
|
+ conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keyword, 0, 2)
|
|
|
if e != nil && e.Error() != utils.ErrNoRow() {
|
|
|
err = errors.New("GetActivityonditionList, Err: " + e.Error())
|
|
|
return
|