Merge branch 'cygx4.2_web' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/morning_meeting.go

@@ -47,7 +47,7 @@ func (this *MorningMeetingController) GatherList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
 	var pars []interface{}
-	condition += ` AND status = 1 `
+	condition += ` AND status = 1  AND  meeting_ids != '' `
 	total, err := models.GetCygxMorningMeetingGatherCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -69,7 +69,7 @@ func (this *MorningMeetingController) GatherList() {
 	mapMeetName := make(map[string]string)
 	if meetids != "" {
 		pars = make([]interface{}, 0)
-		condition = ` 	AND id  IN(` + meetids + `) `
+		condition = ` 	AND id  IN(` + meetids + `)  AND  status = 1   `
 		listMeet, err := models.GetCygxMorningMeetingReviewsList(condition, pars, 0, 10000)
 		if err != nil {
 			br.Msg = "获取失败"