no message

controllers/cygx/activity.go

@@ -1322,6 +1322,7 @@ func (this *ActivityCoAntroller) Delete() {
 
 // @Title 获取活动行业分类
 // @Description 获取活动行业分类接口
+// @Param   IsHideResearch  query  bool  false  "是否隐藏买方研选(默认不隐藏)"
 // @Success 200 {object} cygx.ChartPermissionRepMoreList
 // @router /activity/chartPermission/list [get]
 func (this *ActivityCoAntroller) ChartPermissionListAct() {

controllers/cygx/activity_signup.go

@@ -34,7 +34,7 @@ type ActivitySignupCoAntroller struct {
 // @Param   StartDate   query   string  false       "开始时间 ，列如2021-03-06 "
 // @Param   EndDate   query   string  false       "结束时间，列如2021-03-06 "
 // @Param   KeyWord   query   string  false       "搜索关键词"
-// @Param   SearchType   query   int  true       "筛选类型 1专家/分析师电话会、2专家/分析师线下沙龙 、3公司调研/、4C类电话会"
+// @Param   SearchType   query   int  true       "筛选类型 1专家/分析师电话会、2专家/分析师线下沙龙 、3公司调研/、4C类电话会、5买方线下交流"
 // @Param   ActiveState   query   int  false       "发布状态 ，1未开始、2进行中、3已结束 ，默认1未开始"
 // @Param   PublishStatus   query   int  false       "发布状态 ，0未发布，1已发布，3已取消，传2查询所有"
 // @Param   IsResearch   query   bool  true       "是否为研选"
@@ -87,7 +87,9 @@ func (this *ActivitySignupCoAntroller) SignupList() {
 	condition += ` 	 AND art.active_state =  ?  `
 	pars = append(pars, activeState)
 	if ActivityTypeId == "" {
-		if searchType == 4 {
+		if searchType == 5 {
+			condition += ` AND art.activity_type_id  IN (8) `
+		} else if searchType == 4 {
 			condition += ` AND art.activity_type_id  IN (7) `
 		} else if searchType == 3 {
 			condition += ` AND art.activity_type_id  IN (3,4) `

controllers/cygx/industrial_management.go

@@ -30,6 +30,7 @@ type IndustrialManagementController struct {
 // @Title 获取一级分类
 // @Description 获取一级分类接口
 // @Param   HideMacro  query  bool  false  "是否隐藏宏观(默认不隐藏)"
+// @Param   IsHideResearch  query  bool  false  "是否隐藏买方研选(默认不隐藏)"
 // @Param   IsCeLueReport  query  bool  false  "是否是策略平台的报告类型"
 // @Success 200 {object} cygx.ChartPermissionResp
 // @router /chartPermission/first [get]
@@ -41,6 +42,7 @@ func (this *IndustrialManagementController) ChartPermissionList() {
 	}()
 	// 是否隐藏宏观
 	hideMacro, _ := this.GetBool("HideMacro")
+	isHideResearch, _ := this.GetBool("IsHideResearch")
 	isCeLueReport, _ := this.GetBool("IsCeLueReport")
 	resp := new(cygx.ChartPermissionResp)
 	list, err := cygx.GetChartPermissionAll()
@@ -61,15 +63,20 @@ func (this *IndustrialManagementController) ChartPermissionList() {
 		item.ChartPermissionId = utils.GU_SHOU_ID
 		resp.List = append(resp.List, item)
 	} else {
+		for _, v := range list {
+			if v.PermissionName != utils.CHART_PERMISSION_NAME_MF_YANXUAN && isHideResearch {
+				continue
+			}
+			resp.List = append(resp.List, v)
+		}
 		// 查研观向7.4-新增一个宏观
 		if !hideMacro {
 			macro := &cygx.ChartPermission{
 				ChartPermissionId: 1,
 				PermissionName:    "宏观",
 			}
-			list = append(list, macro)
+			resp.List = append(resp.List, macro)
 		}
-		resp.List = list
 	}
 
 	br.Ret = 200

services/cygx/acitvity.go

@@ -1417,11 +1417,11 @@ func GetActChartPermissionList() []*cygx.ChartPermissionRepMore {
 		{PermissionName: "智造"},
 		{PermissionName: "策略"},
 		{PermissionName: "宏观"},
-		{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN},
-		{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(医药)"},
-		{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(消费)"},
-		{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(科技)"},
-		{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(智造)"},
+		//{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN},
+		//{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(医药)"},
+		//{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(消费)"},
+		//{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(科技)"},
+		//{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(智造)"},
 	}
 	return list
 }