|
@@ -1159,8 +1159,10 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
|
|
}
|
|
}
|
|
var listChartPermissionidNew2 []*models.ActivityChartPermission
|
|
var listChartPermissionidNew2 []*models.ActivityChartPermission
|
|
for _, v := range list2 {
|
|
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 userType == 1 || isHideResearch {
|
|
- //if v.PermissionName != "研选" {
|
|
|
|
if !strings.Contains(v.PermissionName, "研选") {
|
|
if !strings.Contains(v.PermissionName, "研选") {
|
|
listChartPermissionidNew2 = append(listChartPermissionidNew2, v)
|
|
listChartPermissionidNew2 = append(listChartPermissionidNew2, v)
|
|
}
|
|
}
|
|
@@ -1171,6 +1173,9 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
|
|
resp.ListChartPermission2 = listChartPermissionidNew2
|
|
resp.ListChartPermission2 = listChartPermissionidNew2
|
|
var listChartPermissionidNew []*models.ActivityChartPermission
|
|
var listChartPermissionidNew []*models.ActivityChartPermission
|
|
for _, v := range listChartPermissionid {
|
|
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 userType == 1 || isHideResearch {
|
|
if !strings.Contains(v.PermissionName, "研选") {
|
|
if !strings.Contains(v.PermissionName, "研选") {
|
|
listChartPermissionidNew = append(listChartPermissionidNew, v)
|
|
listChartPermissionidNew = append(listChartPermissionidNew, v)
|