Merge branch 'cygx_13.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/chart_permission.go

@@ -216,7 +216,7 @@ func (this *ChartPermissionAuthController) StrategyDetail() {
 		return
 	}
 	resp := new(models.ReportMappingHomeResp)
-	if chartPermissionId != utils.GU_SHOU_ID {
+	if chartPermissionId != utils.GU_SHOU_ID_CHART {
 		if cf.ConfigValue == "1" || user.CompanyId == utils.HZ_COMPANY_ID {
 			item := new(models.ReportMappingHome)
 			item.CategoryId = utils.TIME_LINE_ID

controllers/tag.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
-	"hongze/hongze_cygx/utils"
 )
 
 type TagController struct {
@@ -73,19 +72,18 @@ func (this *TagController) TagCustomizeList() {
 	}
 
 	//var condition string
-	condition = ` AND permission_name IN ('医药1','消费','科技','智造','策略') `
+	condition = ` AND permission_name IN ('医药1','消费','科技','智造','策略','固收') `
 	listPermission, err := models.GetChartPermissionReportAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	item := new(models.ChartPermission)
-	item.ChartPermissionId = utils.GU_SHOU_ID
-	item.PermissionName = utils.GU_SHOU_NAME
-	listPermission = append(listPermission, item)
+	//item := new(models.ChartPermission)
+	//item.ChartPermissionId = utils.GU_SHOU_ID
+	//item.PermissionName = utils.GU_SHOU_NAME
+	//listPermission = append(listPermission, item)
 	resp := new(models.CygxTagListResp)
-
 	resp.List = list
 	resp.ListPermission = listPermission
 	br.Ret = 200

services/article.go

@@ -1286,8 +1286,8 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	}
 	if reportMapDetail.ChartPermissionId == utils.CE_LUE_ID {
 		chartPermissionId = utils.CE_LUE_ID
-	} else if reportMapDetail.ChartPermissionId == utils.GU_SHOU_ID {
-		chartPermissionId = utils.GU_SHOU_ID
+	} else if reportMapDetail.ChartPermissionId == utils.GU_SHOU_ID_CHART {
+		chartPermissionId = utils.GU_SHOU_ID_CHART
 	} else {
 		if reportMapDetail.PermissionType == 1 {
 			chartPermissionName = reportMapDetail.ChartPermissionName + "(主观)"
@@ -1304,7 +1304,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	//文章关联的产业
 	var industryName string
 	var industrialManagementId string
-	if chartPermissionId == utils.CE_LUE_ID || chartPermissionId == utils.GU_SHOU_ID {
+	if chartPermissionId == utils.CE_LUE_ID || chartPermissionId == utils.GU_SHOU_ID_CHART {
 		industryName = reportMapDetail.SubCategoryName
 	} else {
 		if articleInfo.ReportType == 2 {
@@ -1390,7 +1390,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	slicepermissionId := strings.Split(strconv.Itoa(chartPermissionId), ",")
 	if len(slicepermissionId) > 0 {
 		for _, v := range slicepermissionId {
-			if v == strconv.Itoa(utils.GU_SHOU_ID) {
+			if v == strconv.Itoa(utils.GU_SHOU_ID_CHART) {
 				v = strconv.Itoa(utils.CE_LUE_ID)
 			}
 			permissionIdList = append(permissionIdList, v)
@@ -1413,7 +1413,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	}
 
 	//四大行业的行业综述报告，对所有开通了对应行业权限的客户都推送。
-	if articleInfo.ReportType == 1 && chartPermissionId != utils.CE_LUE_ID && chartPermissionId != utils.GU_SHOU_ID {
+	if articleInfo.ReportType == 1 && chartPermissionId != utils.CE_LUE_ID && chartPermissionId != utils.GU_SHOU_ID_CHART {
 		for _, item := range openidPowerList {
 			first := "您关注的赛道，有新的报告发布/更新，欢迎查看"
 			keyword1 := "【" + articleInfo.SubCategoryName + "】有报告发布/更新"
@@ -1429,7 +1429,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	}
 	//获取关注这个文章对应产业的用户的 openid
 	mapOpenidFllow := make(map[int]string)
-	if chartPermissionId != utils.CE_LUE_ID && chartPermissionId != utils.GU_SHOU_ID {
+	if chartPermissionId != utils.CE_LUE_ID && chartPermissionId != utils.GU_SHOU_ID_CHART {
 		openidFllowListMobile, err := models.GetCygxUserFllowOpenid(articleId)
 		if err != nil {
 			return err