no message

controllers/micro_roadshow.go

@@ -417,7 +417,7 @@ func (this *MicroRoadShowController) CommentAdd() {
 	}
 	var resourceId int
 	if sourceType == 1 {
-		activityVoiceInfo, _ := models.GetCygxActivityVoiceByActivityId(req.Id)
+		activityVoiceInfo, _ := models.GetCygxActivityVoiceById(req.Id)
 		if activityVoiceInfo == nil {
 			br.Msg = "操作失败"
 			br.ErrMsg = "活动ID错误,不存在activityId：" + strconv.Itoa(req.Id)

controllers/report.go

@@ -306,7 +306,7 @@ func (this *MobileReportController) IndustryList() {
 		}
 	}
 
-	list, err = services.HandleIndustryList(list, user)
+	list, err = services.HandleIndustryList(list, user, "")
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
@@ -1078,13 +1078,13 @@ func (this *MobileReportController) SearchResource() {
 		return
 	}
 
-	listYx, err = services.HandleIndustryList(listYx, user)
+	listYx, err = services.HandleIndustryList(listYx, user, "Yx")
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	listHz, err = services.HandleIndustryList(listHz, user)
+	listHz, err = services.HandleIndustryList(listHz, user, "Hz")
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()

models/industrial_management.go

@@ -231,10 +231,24 @@ func GetindustrialManagement() (items []*IndustrialManagementRep, err error) {
 }
 
 // 标的列表
-func GetIndustrialSubjectAllByIndustrialId(industrialIdArr []int) (items []*IndustrialSubject, err error) {
+func GetIndustrialSubjectAllByIndustrialId(pars []interface{}, condition string) (items []*IndustrialSubject, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_industrial_subject WHERE industrial_management_id IN  (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)   `
-	_, err = o.Raw(sql, industrialIdArr).QueryRows(&items)
+	sql := `SELECT
+			m.subject_name,
+			m.industrial_management_id,
+			m.industrial_subject_id 
+		FROM
+			cygx_article AS a
+			INNER JOIN cygx_industrial_article_group_subject AS mg ON mg.article_id = a.article_id
+			INNER JOIN cygx_industrial_subject AS m ON m.industrial_subject_id = mg.industrial_subject_id 
+		WHERE
+			1 = 1
+			AND a.publish_status = 1  ` + condition + `
+		GROUP BY
+			m.industrial_subject_id 
+ORDER BY
+	a.publish_date DESC  `
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 

services/industrial_management.go

@@ -79,7 +79,7 @@ func IndustryFllowWithTrack(industrialManagementId, count, uid int) (err error)
 }
 
 // HandleIndustryList预处理产业列表字段
-func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUserItem) (items []*models.IndustrialManagement, err error) {
+func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUserItem, resource string) (items []*models.IndustrialManagement, err error) {
 	userId := user.UserId
 	fllowList, err := models.GetUserFllowIndustrialList(userId)
 	if err != nil {
@@ -91,6 +91,20 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 			fllowMap[v.IndustrialManagementId] = v.IndustrialManagementId
 		}
 	}
+	var condition string
+	var pars []interface{}
+	articleTypeIds, _ := GetYanXuanArticleTypeIds()
+	//给默认值
+	if resource != "Yx" {
+		resource = "Hz"
+	}
+	if articleTypeIds != "" {
+		if resource == "Yx" {
+			condition = ` AND a.article_type_id  IN (` + articleTypeIds + `)	`
+		} else {
+			condition = ` AND a.article_type_id  NOT  IN (` + articleTypeIds + `)	`
+		}
+	}
 	mapindustrialId, e := GetMicroRoadshowVideoMap()
 	if e != nil {
 		err = e
@@ -124,7 +138,9 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 
 	if len(industrialIdArr) > 0 {
 		//合并产业关联的标的
-		listSubjcet, err = models.GetIndustrialSubjectAllByIndustrialId(industrialIdArr)
+		condition += ` AND 	m.industrial_management_id  IN (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)`
+		pars = append(pars, industrialIdArr)
+		listSubjcet, err = models.GetIndustrialSubjectAllByIndustrialId(pars, condition)
 		if err != nil {
 			return
 		}
@@ -165,18 +181,6 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 		}
 	}
 
-	//mapHistroyArticleId := make(map[int]int)
-
-	//if userId > 0 {
-	//	listArticleHistory, e := models.GetUserToArticleHistory(userId, articleIdArr)
-	//	if e != nil && e.Error() != utils.ErrNoRow() {
-	//		err = errors.New("获取产业关联的视频失败，GetindustryVideo " + e.Error())
-	//		return
-	//	}
-	//	for _, v := range listArticleHistory {
-	//		mapHistroyArticleId[v.ArticleId] = v.ArticleId
-	//	}
-	//}
 	var industrialIds string
 	for _, id := range industrialIdArr {
 		industrialIds += strconv.Itoa(id) + ","

services/report.go

@@ -97,7 +97,7 @@ func GetSearchResourceListHz(condition string, user *models.WxUserItem) (items [
 	if err != nil {
 		return
 	}
-	listHz, err = HandleIndustryList(listHz, user)
+	listHz, err = HandleIndustryList(listHz, user, "")
 	items = listHz
 	return
 }