no message

models/cygx_morning_meeting_review_chapter.go

@@ -23,7 +23,9 @@ type CygxMorningMeetingReviewChapter struct {
 // 列表
 func GetCygxMorningMeetingReviewChapterList(condition string, pars []interface{}) (items []*CygxMorningMeetingGatherDetailListResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE 1 = 1 `
+	sql := `SELECT c.*
+			FROM cygx_morning_meeting_review_chapter  as  c 
+			INNER JOIN cygx_morning_meeting_reviews as r ON  r.id = c.meeting_id   WHERE 1 = 1  AND r.status = 1 `
 	if condition != "" {
 		sql += condition
 	}

services/resource_data.go

@@ -91,7 +91,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	//处理晨会精华
 	if len(meetingreviewchaptIds) > 0 {
 		pars = make([]interface{}, 0)
-		condition = ` AND id IN (` + utils.GetOrmInReplace(len(meetingreviewchaptIds)) + `)`
+		condition = ` AND c.id IN (` + utils.GetOrmInReplace(len(meetingreviewchaptIds)) + `)`
 		pars = append(pars, meetingreviewchaptIds)
 
 		listrMeet, e := models.GetCygxMorningMeetingReviewChapterList(condition, pars)
@@ -120,19 +120,19 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 	}
 
-	//处理上周纪要汇总
-	if len(minutessummaryIds) > 0 {
+	//处理本周纪要汇总
+	if len(researchsummaryIds) > 0 {
 		pars = make([]interface{}, 0)
-		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(minutessummaryIds)) + `)`
-		pars = append(pars, minutessummaryIds)
+		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(researchsummaryIds)) + `)`
+		pars = append(pars, researchsummaryIds)
 
-		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_minutes_summary", pars, 0, len(minutessummaryIds))
+		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_research_summary", pars, 0, len(researchsummaryIds))
 		if e != nil {
-			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			err = errors.New("GetReportSelectionListHome, Err: " + e.Error())
 			return
 		}
 		for _, v := range listresearchsummary {
-			mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Minutessummary = v
+			mapItems[fmt.Sprint("researchsummary", v.ArticleId)].Researchsummary = v
 		}
 	}