Merge branch 'cygx_14.0' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

controllers/report.go

@@ -443,6 +443,7 @@ func (this *MobileReportController) ArticleCategoryList() {
 		br.ErrMsg = "获取用户权限失败, Err: " + err.Error()
 		return
 	}
+	followTypeMap := services.GetCygxIndustryFllowListTypeMapByMobile(user.Mobile) // 关注的对应状态
 	timeLineItem.IsRed = timeLineIsRed
 	list = append([]*models.IndustrialToArticleCategoryRep{&timeLineItem}, list...)
 	resp := new(models.IndustrialToArticleCategoryListRep)
@@ -455,6 +456,7 @@ func (this *MobileReportController) ArticleCategoryList() {
 		resp.IndustryVideo = videoSimple
 	}
 	resp.AuthInfo = au
+	resp.FollowType = followTypeMap[industrialManagementId]
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/research.go

@@ -545,7 +545,9 @@ func (this *MobileResearchController) ThemeDetail() {
 			resp.ListSubject = append(resp.ListSubject, itemSubJect)
 		}
 	}
+	followTypeMap := services.GetCygxIndustryFllowListTypeMapByMobile(user.Mobile) // 关注的对应状态
 	resp.IndustryName = detailIndustrial.IndustryName
+	resp.FollowType = followTypeMap[industrialManagementId]
 	resp.IndustrialManagementId = detailIndustrial.IndustrialManagementId
 	br.Ret = 200
 	br.Success = true

models/report.go

@@ -1172,6 +1172,7 @@ type GetThemeDetailResp struct {
 	IndustrialManagementId int                  `description:"产业Id"`
 	IndustryName           string               `description:"产业名称"`
 	IsFollow               bool                 `description:"是否关注"`
+	FollowType             int                  `description:"1,重点关注，3不感兴趣，0默认接受推送"`
 	ListSubject            []*IndustrialSubject `description:"标的列表"`
 	List                   []*ArticleResearchResp
 }

models/report_mapping.go

@@ -136,6 +136,7 @@ type IndustrialToArticleCategoryListRep struct {
 	LayoutTime             string `description:"布局时间"`
 	IndustryName           string `description:"产业名称"`
 	IndustrialManagementId int    `description:"产业D"`
+	FollowType             int    `description:"1,重点关注，3不感兴趣，0默认接受推送"`
 	List                   []*IndustrialToArticleCategoryRep
 	ListSubject            []*IndustrialSubject
 	IndustryVideo          *MicroVideoSimpleInfo