Merge branch 'cygx_8.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2004,6 +2004,7 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 	br.Success = true
 	if hasPermission == 1 {
 		br.Msg = "设置成功，会前15分钟会为您推送微信消息提醒"
+		resp.PopupMsg = "设置成功，会前15分钟会为您推送微信消息提醒<br/><br/>请关注【查研观向小助手】公众号，以获取微信消息提醒"
 	}
 	br.Data = resp
 }
@@ -4435,6 +4436,7 @@ func (this *ActivityCoAntroller) ActivityAppointmentAdd() {
 	br.Success = true
 	if hasPermission == 1 {
 		br.Msg = "请关注【查研观向小助手】公众号，若有调研纪要发布/更新，将及时为您推送微信消息"
+		resp.PopupMsg = "会议纪要预约成功<br/><br/>请关注【查研观向小助手】公众号，若有调研纪要发布/更新，将及时为您推送微信消息"
 	}
 	br.Data = resp
 }

services/activity.go

@@ -637,8 +637,8 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		}
 
 		//活动音频，设置有效时间为30天，失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
-		endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
-		condition += ` AND art.activity_time > '` + endTime + `'  `
+		//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+		//condition += ` AND art.activity_time > '` + endTime + `'  `
 		if len(ativityVIdArry) > 0 {
 			ativityVIdstr := strings.Join(ativityVIdArry, ",")
 			fmt.Println(ativityVIdstr)