Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -496,15 +496,22 @@ func (this *ActivityCoAntroller) Detail() {
 			return
 		}
 		activityInfo.SignupType = mapActivitySignup[activityId]
+		//处理活动关联的产业
+		industrialListNew, err := models.GetIndustrialActivityGroupManagementList(activityId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取活动关联的产业列表信息失败，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+			return
+		}
 		//判断是不是通过微信模版推送消息进来的
-		if isSendWx == 0 && len(industrialList) > 0 {
+		if isSendWx == 1 && len(industrialListNew) > 0 {
 			industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
 			if err != nil {
 				br.Msg = "获取信息失败"
 				br.ErrMsg = "GetActivitySignupResp，Err:" + err.Error()
 				return
 			}
-			for _, v := range industrialList {
+			for _, v := range industrialListNew {
 				if industryUserFollowMap[v.IndustrialManagementId] {
 					activityInfo.IsFollowButton = true
 				}

controllers/article.go

@@ -82,7 +82,7 @@ func (this *ArticleController) Detail() {
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	if isSendWx == 0 {
+	if isSendWx == 1 {
 		var condition string
 		var pars []interface{}
 		pars = make([]interface{}, 0)

controllers/micro_roadshow.go

@@ -80,34 +80,35 @@ func (this *MicroRoadShowController) List() {
 		br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
 		return
 	}
-	var pageSizeIk int
-
-	//获取总的数量
-	totalIk, e := services.CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取微路演联想词列表失败, Err: " + e.Error()
-		return
-	}
-	pageSizeIk = totalIk - len(list)
-	//处理IK分词部分的分页获取条数
-	startSizeIk := utils.StartIndex(currentIndex, pageSize)
-	startSizeIk = startSizeIk - total
-	if startSizeIk < 0 {
-		startSizeIk = 0
-	}
-	if pageSizeIk > 0 {
-		lisIk, e := services.GetMicroRoadShowPageListIkWord(startSizeIk, pageSizeIk, audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds, keywords)
+	if keywords != "" {
+		var pageSizeIk int
+		//获取总的数量
+		totalIk, e := services.CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds)
 		if e != nil {
 			br.Msg = "获取失败"
-			br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
+			br.ErrMsg = "获取微路演联想词列表失败, Err: " + e.Error()
 			return
 		}
-		for _, item := range lisIk {
-			list = append(list, item)
+		pageSizeIk = totalIk - len(list)
+		//处理IK分词部分的分页获取条数
+		startSizeIk := utils.StartIndex(currentIndex, pageSize)
+		startSizeIk = startSizeIk - total
+		if startSizeIk < 0 {
+			startSizeIk = 0
+		}
+		if pageSizeIk > 0 {
+			lisIk, e := services.GetMicroRoadShowPageListIkWord(startSizeIk, pageSizeIk, audioId, videoId, activityVideoId, filter, keyWordArr, audioIds, videoIds, activityVideoIds, keywords)
+			if e != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()
+				return
+			}
+			for _, item := range lisIk {
+				list = append(list, item)
+			}
 		}
+		total = totalIk
 	}
-	total = totalIk
 	userId := user.UserId
 	listMycollect, err := models.GetUserMicroRoadshowCollectList(userId)
 	if err != nil {

controllers/report.go

@@ -435,7 +435,7 @@ func (this *ReportController) ArticleCategoryList() {
 	if videoSimple.Id > 0 {
 		resp.IndustryVideo = videoSimple
 	}
-	if isSendWx == 0 {
+	if isSendWx == 1 {
 		industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -1549,6 +1549,11 @@ func (this *ReportController) Detail() {
 		br.Ret = 408
 		return
 	}
+	if user.CompanyId != utils.HZ_COMPANY_ID {
+		br.Msg = "报告编辑中，请稍后"
+		br.IsSendEmail = false
+		return
+	}
 	uid := user.UserId
 	articleId, _ := this.GetInt("ArticleId")
 	isBestNew, _ := this.GetBool("IsBestNew")
@@ -1680,12 +1685,13 @@ func (this *ReportController) Detail() {
 						br.ErrMsg = "获取信息失败,Err:" + err.Error()
 						return
 					}
-					v2.IsNew = isNew
+					//v2.IsNew = isNew
 					listSonLog[k2].List = listIndustrial
 					if v2.Label != "" {
 						v2.CompanyLabel = strings.Split(v2.Label, "{|}")
 					}
 				}
+				isNew = false
 				itemSubject.ListSubject = append(itemSubject.ListSubject, &models.ReportSelectionChartLogSubjectName{SubjectName: v2.SubjectName, IsNew: isNew, IndustrialSubjectId: v2.IndustrialSubjectId})
 			}
 			item.BodyChartSummary = mapChartLog[v.PermissionName]