xingzai 9 bulan lalu
induk
melakukan
9098ad4ee1
4 mengubah file dengan 17 tambahan dan 3 penghapusan
  1. 1 1
      controllers/chart_permission.go
  2. 2 1
      models/chart_permission.go
  3. 1 1
      services/article.go
  4. 13 0
      utils/config.go

+ 1 - 1
controllers/chart_permission.go

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

+ 2 - 1
models/chart_permission.go

@@ -72,7 +72,8 @@ func GetChartPermissionById(chartPermissionId int) (item *ChartPermission, err e
 
 func GetChartPermissionActivity() (items []*ActivityChartPermission, err error) {
 	o := orm.NewOrmUsingDB("weekly_report")
-	sql := `SELECT * FROM chart_permission WHERE chart_permission_id IN (19,20,21,22,23,31,53) ORDER BY sort ASC `
+	//sql := `SELECT * FROM chart_permission WHERE chart_permission_id IN (19,20,21,22,23,31,53) ORDER BY sort ASC `
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND is_report=1 AND permission_type!=2   AND permission_name IN ('医药','消费','科技','智造','策略','固收','研选订阅','周期') ORDER BY sort ASC  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

+ 1 - 1
services/article.go

@@ -730,7 +730,7 @@ func UpdateArticleByRedis() (err error) {
 //	//for i := 8648; i < 9004; i++ {
 //	//	HandleArticleListByApi(9552)
 //	//}
-//	HandleArticleListByApi(10875)
+//	HandleArticleListByApi(10914)
 //	//UpdateArticleResourceData(9551)
 //}
 

+ 13 - 0
utils/config.go

@@ -99,6 +99,8 @@ var (
 	YiDongHuaWeiYunUrl        string //易董 华为云请求域名
 	YiDonggetOriginalLink     string //易董 短连接转为长链接
 	ShangHaiCrmApiLink        string //上海CRM用户同步api调用地址
+
+	ZHOU_QI_ID int // 行业周期的ID
 )
 
 // 模板消息推送
@@ -205,6 +207,7 @@ func init() {
 		ShangHaiCrmApiLink = "https://crm.hzinsights.com/"
 		SendWxTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_template_msg"
 		SendWxCategoryTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_category_template_msg"
+
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
 		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
@@ -291,6 +294,7 @@ func init() {
 
 	//易董开放api配置
 	YiDongApiConfig()
+	ChartPermissionId()
 }
 
 // YiDongApiConfig 易董开放api配置
@@ -310,6 +314,15 @@ func YiDongApiConfig() {
 	}
 }
 
+// 行业ID信息 易董开放api配置
+func ChartPermissionId() {
+	if RunMode == "release" {
+		ZHOU_QI_ID = 62
+	} else {
+		ZHOU_QI_ID = 138
+	}
+}
+
 //
 //YiDongZhengTongYunUrl     string //易董 证通云请求域名
 //YiDongZhengTongYunAppid   string //易董 证通云请求appid