|
@@ -89,9 +89,9 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
whichDay := this.GetString("WhichDay")
|
|
|
isShowJurisdiction, _ := this.GetInt("IsShowJurisdiction")
|
|
|
keyWord := this.GetString("KeyWord")
|
|
|
+ keyWordSearch := this.GetString("KeyWord")
|
|
|
activeState := this.GetString("ActiveState")
|
|
|
label := this.GetString("Label")
|
|
|
-
|
|
|
//入参为 undefined 时的处理
|
|
|
if chartPermissionIds == "undefined" {
|
|
|
chartPermissionIds = ""
|
|
@@ -135,6 +135,7 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
if isShowJurisdiction == 1 && chartPermissionIds == "" && userType == 4 {
|
|
|
activityTypeIds = "1,3"
|
|
|
}
|
|
|
+
|
|
|
var startSize int
|
|
|
if pageSize <= 0 {
|
|
|
pageSize = utils.PageSize20
|
|
@@ -268,7 +269,6 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
} else {
|
|
|
condition += ` ORDER BY art.active_state ASC, art.activity_time ASC `
|
|
|
}
|
|
|
-
|
|
|
list, errList := models.GetActivityListAll(condition, pars, uid, startSize, pageSize)
|
|
|
if errList != nil {
|
|
|
br.Msg = "获取失败"
|
|
@@ -286,6 +286,14 @@ func (this *ActivityCoAntroller) ActivityList() {
|
|
|
list[k].IsShowSustainable = true
|
|
|
}
|
|
|
}
|
|
|
+ if keyWordSearch != "" {
|
|
|
+ keyWordItem := new(models.CygxUserSearchKeyWord)
|
|
|
+ keyWordItem.UserId = user.UserId
|
|
|
+ keyWordItem.KeyWord = keyWordSearch
|
|
|
+ keyWordItem.PageType = "ActivitSearch"
|
|
|
+ keyWordItem.CreateTime = time.Now()
|
|
|
+ go models.AddUserSearchKeyWord(keyWordItem)
|
|
|
+ }
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
resp := new(models.GetCygxActivityListRep)
|
|
|
resp.List = list
|