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

controllers/activity.go

@@ -1160,8 +1160,10 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 	}
 	var listChartPermissionidNew2 []*models.ActivityChartPermission
 	for _, v := range list2 {
+		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+			v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+		}
 		if userType == 1 || isHideResearch {
-			//if v.PermissionName != "研选" {
 			if !strings.Contains(v.PermissionName, "研选") {
 				listChartPermissionidNew2 = append(listChartPermissionidNew2, v)
 			}
@@ -1172,6 +1174,9 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 	resp.ListChartPermission2 = listChartPermissionidNew2
 	var listChartPermissionidNew []*models.ActivityChartPermission
 	for _, v := range listChartPermissionid {
+		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+			v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+		}
 		if userType == 1 || isHideResearch {
 			if !strings.Contains(v.PermissionName, "研选") {
 				listChartPermissionidNew = append(listChartPermissionidNew, v)