|
@@ -2032,7 +2032,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
|
|
|
// return
|
|
|
// fmt.Println("len", len(listDing))
|
|
|
//}
|
|
|
- condition = " AND art.is_limit_people = 1 AND art.publish_status = 1 "
|
|
|
+ //condition = " AND art.is_limit_people = 1 AND art.publish_status = 1 "
|
|
|
//活动可见限制
|
|
|
conditionActivityAll, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 3)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
@@ -2074,6 +2074,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
|
|
|
conditionOrder = ` ORDER BY art.activity_time ASC `
|
|
|
}
|
|
|
conditionActivityKey += condition + conditionOrder
|
|
|
+ //fmt.Println(conditionOrder)
|
|
|
|
|
|
list, errList := models.GetActivityListNew(conditionActivityKey, pars, uid, startSize, pageSize, playBack, filter, typeName)
|
|
|
if errList != nil {
|
|
@@ -2082,6 +2083,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ return
|
|
|
+
|
|
|
if keyWord != "" {
|
|
|
keyWordArr, err := services.GetIndustryMapNameSliceV3(keyWord)
|
|
|
if err != nil {
|