Merge branch 'crm/crm_16.2' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/calendar.go

@@ -1335,7 +1335,12 @@ func (this *CalendarController) CalendarList() {
 		}
 		//权益研究员的【路演】和【沙龙】，未结束时，显示修改按钮
 		if raiAskadminMap[dataList[i].ResearcherId] && utils.InArrayByStr([]string{"路演", "沙龙"}, dataList[i].ActivityType) && dataList[i].Status == 2 {
-			dataList[i].EditButton = true
+			//未开始的才展示修改按钮
+			startTimeStr := dataList[i].StartDate + " " + dataList[i].StartTime
+			startTime := utils.StrTimeToTime(startTimeStr)
+			if startTime.After(time.Now()) {
+				dataList[i].EditButton = true
+			}
 		}
 	}