图片

controllers/activity.go

@@ -356,7 +356,6 @@ func (this *ActivityController) ActivityListNew() {
 			if au.HasPermission == 1 {
 				list[k].VideoDetail = mapActivityVideo[v.ActivityId]
 			}
-
 		}
 		activityList = append(activityList, services.ActivityButtonShow(list[k], user))
 	}

controllers/home.go

@@ -282,6 +282,7 @@ func (this *MobileHomeController) NewList() {
 	resp := new(models.HomeResourceDataListResp)
 	//查询近一个月的数据
 	conditionInit = " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
+	//conditionInit += `  AND source IN ('newchart')`
 	if user.CompanyId <= 1 {
 		condition += " AND source IN ('roadshow','article','newchart') "
 		startSize = 0

models/db.go

@@ -52,6 +52,7 @@ func init() {
 		new(CygxActivityMeetingReminderLog),
 		new(CygxActivityAppointment),
 		new(CygxActivityHelpAsk),
+		new(UserTemplateRecord),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

models/report_mapping.go

@@ -43,10 +43,10 @@ type TradeReportMappingResp struct {
 	List []*TradeReportMapping
 }
 
-//获取策略下面的所有分类
+//获取所有分类
 func GetReportMappingStrategyAll() (items []*ReportMapping, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_report_mapping WHERE report_type=1 AND chart_permission_id=23 ORDER BY sort ASC `
+	sql := `SELECT * FROM cygx_report_mapping WHERE 1=1 ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/article.go

@@ -104,6 +104,17 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp) (items []*models.A
 		imgUrlChart = vslice[len(vslice)-1]
 		mapCategoryUrl[categoryId] = imgUrlChart
 	}
+
+	mapChartPerssion := make(map[string]string)
+	reportMappingList, err := models.GetReportMappingStrategyAll()
+	if err != nil {
+		err = errors.New("GetReportMappingStrategyAll err" + err.Error())
+		return
+	}
+
+	for _, v := range reportMappingList {
+		mapChartPerssion[strconv.Itoa(v.CategoryId)] = v.ChartPermissionName
+	}
 	for k, v := range list {
 		item := list[k]
 		//如果文章一开始的内容是图片，优先展示第一张图片
@@ -115,6 +126,7 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp) (items []*models.A
 		if item.Pv > 999 {
 			list[k].Pv = 999
 		}
+		list[k].ChartPermissionName = mapChartPerssion[v.CategoryId]
 		//如果是研选系列的任意取五张图片的中的一张
 		if v.CategoryId == "0" || v.ArticleId > utils.SummaryArticleId {
 			knum := v.ArticleId % 5

services/resource_data.go

@@ -58,15 +58,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			activityspecialIds = append(activityspecialIds, v.SourceId)
 		}
 	}
-
-	//fmt.Println("articleIds", articleIds)
-	//fmt.Println("newchartIds", newchartIds)
-	//fmt.Println("roadshowIds", roadshowIds)
-	//fmt.Println("activityIds", activityIds)
-	//fmt.Println("activityvideoIds", activityvideoIds)
-	//fmt.Println("activityvoiceIds", activityvoiceIds)
-	//fmt.Println("activityspecialIds", activityspecialIds)
-
 	detail, e := models.GetConfigByCode("city_img_url")
 	if e != nil {
 		err = errors.New("GetResourceDataList, Err: " + e.Error())

services/wx_template_msg.go

@@ -139,26 +139,14 @@ func SendActivityAskApplyTemplateMsgV2(keyword1, keyword2, keyword3, keyword4, r
 	}()
 
 	var accessToken string
-	if utils.RunMode == "release" {
-		accessToken, err = models.GetWxAccessTokenByXzs()
-		if err != nil {
-			msg = "GetWxAccessToken Err:" + err.Error()
-			return
-		}
-		if accessToken == "" {
-			msg = "accessToken is empty"
-			return
-		}
-	} else {
-		accessToken, err = models.GetWxAccessToken()
-		if err != nil {
-			msg = "GetWxAccessToken Err:" + err.Error()
-			return
-		}
-		if accessToken == "" {
-			msg = "accessToken is empty"
-			return
-		}
+	accessToken, err = models.GetWxAccessTokenByXzs()
+	if err != nil {
+		msg = "GetWxAccessToken Err:" + err.Error()
+		return
+	}
+	if accessToken == "" {
+		msg = "accessToken is empty"
+		return
 	}
 	activityId := itemAct.ArticleId
 	//fmt.Println("itemAct.Host", itemAct.Host)