|
@@ -455,6 +455,7 @@ func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int,
|
|
|
list[k].TripStatus = 1
|
|
|
} else {
|
|
|
list[k].TripStatus = 2
|
|
|
+ list[k].TripImgLink = list[k].TripImgLinkFix
|
|
|
}
|
|
|
}
|
|
|
return
|
|
@@ -498,8 +499,8 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
|
|
|
var pars, parsSpecil []interface{}
|
|
|
if keywords != "" {
|
|
|
keywords = "%" + keywords + "%"
|
|
|
- conditionSpecil += ` AND (art.research_theme LIKE ? OR art.label LIKE ? ) `
|
|
|
- parsSpecil = append(parsSpecil, keywords, keywords)
|
|
|
+ conditionSpecil += ` AND (art.research_theme LIKE ? OR art.label LIKE ? OR art.industrial_name LIKE ? OR art.industrial_subject_name LIKE ? ) `
|
|
|
+ parsSpecil = append(parsSpecil, keywords, keywords, keywords, keywords)
|
|
|
}
|
|
|
list, totalSearche, e := models.GetActivitySpecialSearcheList(condition, pars, conditionSpecil, parsSpecil, startSize, pageSize)
|
|
|
if e != nil {
|