Merge branch 'cygx_10.8' into debug

models/article.go

@@ -765,14 +765,14 @@ func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, indu
 
 	actSql := ` SELECT GROUP_CONCAT(DISTINCT act.activity_id SEPARATOR ',') AS act_ids FROM cygx_activity as act `
 
-	mmSql := ` SELECT GROUP_CONCAT(DISTINCT mm.id SEPARATOR ',') AS mm_ids FROM cygx_morning_meeting_reviews as mm `
+	mmSql := ` SELECT GROUP_CONCAT(DISTINCT mmc.id SEPARATOR ',') AS mm_ids FROM cygx_morning_meeting_review_chapter as mmc `
 
 	if industryStr != "" {
 		artSql += ` INNER JOIN cygx_industrial_article_group_management  AS iam ON iam.article_id = art.article_id 
 				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
 		actSql += ` INNER JOIN cygx_industrial_activity_group_management  AS iam ON iam.activity_id = act.activity_id 
 				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
-		mmSql += ` INNER JOIN cygx_morning_meeting_review_chapter  AS mmc ON mmc.meeting_id = mm.id 
+		mmSql += ` INNER JOIN cygx_morning_meeting_reviews  AS mm ON mmc.meeting_id = mm.id 
 				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=mmc.industry_id  `
 	}
 	if subjectNameStr != "" {
@@ -780,7 +780,7 @@ func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, indu
 				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
 		actSql += ` INNER JOIN cygx_industrial_activity_group_subject  AS ias ON ias.activity_id = act.activity_id 
 				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
-		mmSql += ` INNER JOIN cygx_morning_meeting_review_chapter  AS mmc ON mmc.meeting_id = mm.id 
+		mmSql += ` IINNER JOIN cygx_morning_meeting_reviews  AS mm ON mmc.meeting_id = mm.id 
 				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=mmc.industrial_subject_ids  `
 	}
 	artSql += ` WHERE 1=1 `