Merge branch 'cygx_6.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/chart_permission.go

@@ -122,7 +122,10 @@ func (this *ChartPermissionAuthController) ReportDetail() {
 			}
 		}
 	}
-	condition += ` AND permission_name  != '买方研选'`
+
+	if userType == 1 {
+		condition += ` AND permission_name  != '买方研选'`
+	}
 	list, err := models.GetChartPermissionReportAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -138,7 +141,7 @@ func (this *ChartPermissionAuthController) ReportDetail() {
 		} else {
 			resp.List = append(resp.List, v)
 		}
-		if services.GetShowSustainable() && v.PermissionName == "研选" {
+		if services.GetShowSustainable() && v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
 			resp.List[k].IsShowSustainable = true
 		}
 	}