no message

controllers/activity.go

@@ -384,6 +384,69 @@ func (this *ActivityCoAntroller) Detail() {
 		return
 	}
 	resp.IsResearchSpecial = isResearchSpecial
+
+	//处理活动关联的产业
+	industrialList, err := models.GetIndustrialActivityGroupManagementList(activityId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取活动关联的产业列表信息失败，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+		return
+	}
+	if activityInfo.TemporaryLabel != "" {
+		industrialList = make([]*models.IndustrialManagementRep, 0)
+		item := new(models.IndustrialManagementRep)
+		item.IndustryName = activityInfo.Label
+		industrialList = append(industrialList, item)
+	} else {
+		industryIds := make([]int, 0)
+		var industrialManagementId string
+		for k, v := range industrialList {
+			if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+				industrialList[k].IsResearch = true
+			}
+			industryIds = append(industryIds, v.IndustrialManagementId)
+			industrialManagementId += strconv.Itoa(v.IndustrialManagementId) + ","
+		}
+
+		// 查研观向7.4-行业新标签
+		industryNewMap, e := services.GetIndustryNewLabelMap(industryIds)
+		if e != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取产业新标签失败, Err: " + e.Error()
+			return
+		}
+
+		//判断产业下是否有关联的报告，并处理是否跳转
+		industrialManagementId = strings.TrimRight(industrialManagementId, ",")
+		if industrialManagementId != "" {
+			var condition string
+			condition = ` AND m.industrial_management_id IN (` + industrialManagementId + `)`
+			condition += ` AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId)
+			listIndustrialGrop, err := models.GetSearchResourceList(user.UserId, condition, 0, 0)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "GetSearchResourceList，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+				return
+			}
+			mapIndustrial := make(map[int]int)
+			if len(listIndustrialGrop) > 0 {
+				for _, v := range listIndustrialGrop {
+					mapIndustrial[v.IndustrialManagementId] = v.IndustrialManagementId
+				}
+			}
+			for k, v := range industrialList {
+				if mapIndustrial[v.IndustrialManagementId] > 0 && !industrialList[k].IsResearch {
+					industrialList[k].IsJump = true
+				}
+				//非买方研选下的才展示New标签
+				if activityInfo.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
+					industrialList[k].IndustryNewLabel = industryNewMap[v.IndustrialManagementId]
+				}
+			}
+		}
+	}
+	activityInfo.Listndustrial = industrialList
+
 	if havePower {
 		//是否展示限免标签
 		if services.GetShowSustainable() && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
@@ -409,67 +472,6 @@ func (this *ActivityCoAntroller) Detail() {
 		}
 		activityInfo.ActivityTypeName = strings.Replace(activityInfo.ActivityTypeName, "（C类）", "", -1)
 
-		//处理活动关联的产业
-		industrialList, err := models.GetIndustrialActivityGroupManagementList(activityId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取活动关联的产业列表信息失败，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
-			return
-		}
-		if activityInfo.TemporaryLabel != "" {
-			industrialList = make([]*models.IndustrialManagementRep, 0)
-			item := new(models.IndustrialManagementRep)
-			item.IndustryName = activityInfo.Label
-			industrialList = append(industrialList, item)
-		} else {
-			industryIds := make([]int, 0)
-			var industrialManagementId string
-			for k, v := range industrialList {
-				if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-					industrialList[k].IsResearch = true
-				}
-				industryIds = append(industryIds, v.IndustrialManagementId)
-				industrialManagementId += strconv.Itoa(v.IndustrialManagementId) + ","
-			}
-
-			// 查研观向7.4-行业新标签
-			industryNewMap, e := services.GetIndustryNewLabelMap(industryIds)
-			if e != nil {
-				br.Msg = "获取信息失败"
-				br.ErrMsg = "获取产业新标签失败, Err: " + e.Error()
-				return
-			}
-
-			//判断产业下是否有关联的报告，并处理是否跳转
-			industrialManagementId = strings.TrimRight(industrialManagementId, ",")
-			if industrialManagementId != "" {
-				var condition string
-				condition = ` AND m.industrial_management_id IN (` + industrialManagementId + `)`
-				condition += ` AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId)
-				listIndustrialGrop, err := models.GetSearchResourceList(user.UserId, condition, 0, 0)
-				if err != nil && err.Error() != utils.ErrNoRow() {
-					br.Msg = "获取信息失败"
-					br.ErrMsg = "GetSearchResourceList，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
-					return
-				}
-				mapIndustrial := make(map[int]int)
-				if len(listIndustrialGrop) > 0 {
-					for _, v := range listIndustrialGrop {
-						mapIndustrial[v.IndustrialManagementId] = v.IndustrialManagementId
-					}
-				}
-				for k, v := range industrialList {
-					if mapIndustrial[v.IndustrialManagementId] > 0 && !industrialList[k].IsResearch {
-						industrialList[k].IsJump = true
-					}
-					//非买方研选下的才展示New标签
-					if activityInfo.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
-						industrialList[k].IndustryNewLabel = industryNewMap[v.IndustrialManagementId]
-					}
-				}
-			}
-		}
-		activityInfo.Listndustrial = industrialList
 		if activityInfo.YidongActivityId != "" {
 			ydTgc, _ := services.GetYiDongCreateUserInfo(user)
 			yidongLongLink, err := services.GetYiDongOriginalLink(activityInfo)

controllers/user.go

@@ -424,7 +424,6 @@ func (this *UserController) Detail() {
 				detail.UserCardType = 2
 				detail.UserCardEndDate = userCard.EndDate.Format(utils.FormatDate)
 			}
-			hasPermission = 1 // 开通日卡月卡之后，用户有权限
 		}
 
 		if detail.Mobile != "" {