no message

controllers/chart_permission.go

@@ -277,29 +277,29 @@ func (this *ChartPermissionAuthController) ReportDetailV7() {
 		return
 	}
 	var condition string
-	var userType int
-	if user.CompanyId > 1 {
-		total, err := models.GetCountCompanyDetailByIdGroup(user.CompanyId)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		if total == 0 {
-			userType = 0
-		} else {
-			companyDetail, err := models.GetCompanyDetailByIdGroup(user.CompanyId)
-			if err != nil {
-				br.Msg = "获取信息失败！"
-				br.ErrMsg = "获取客户详情失败，Err:" + err.Error()
-				return
-			}
-			if companyDetail.Status == "永续" {
-				userType = 1
-			}
-		}
-	}
-	condition += ` AND permission_name  != '买方研选'`
+	//var userType int
+	//if user.CompanyId > 1 {
+	//	total, err := models.GetCountCompanyDetailByIdGroup(user.CompanyId)
+	//	if err != nil {
+	//		br.Msg = "获取失败"
+	//		br.ErrMsg = "获取失败，Err:" + err.Error()
+	//		return
+	//	}
+	//	if total == 0 {
+	//		userType = 0
+	//	} else {
+	//		companyDetail, err := models.GetCompanyDetailByIdGroup(user.CompanyId)
+	//		if err != nil {
+	//			br.Msg = "获取信息失败！"
+	//			br.ErrMsg = "获取客户详情失败，Err:" + err.Error()
+	//			return
+	//		}
+	//		if companyDetail.Status == "永续" {
+	//			userType = 1
+	//		}
+	//	}
+	//}
+	condition += ` AND permission_name  NOT  IN  (31,52)`
 	list, err := models.GetChartPermissionReportAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -308,13 +308,15 @@ func (this *ChartPermissionAuthController) ReportDetailV7() {
 	}
 	resp := new(models.ChartPermissionResp)
 	for k, v := range list {
-		if userType == 1 {
-			if v.PermissionName != "研选" {
-				resp.List = append(resp.List, v)
-			}
-		} else {
-			resp.List = append(resp.List, v)
-		}
+		//if userType == 1 {
+		//	if v.PermissionName != "研选" {
+		//		resp.List = append(resp.List, v)
+		//	}
+		//} else {
+		//	resp.List = append(resp.List, v)
+		//}
+
+		//if  strings.Contains(v.PermissionName,"")
 		if services.GetShowSustainable() && v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
 			resp.List[k].IsShowSustainable = true
 		}

services/activity.go

@@ -583,7 +583,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	}
 
 	//如果用户开通了研选扣点包，但是没开通研选订阅，那么就拼接一个研选订阅的权限名称
-	if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) && strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+	if strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
 		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 		permissionStrZhengShi += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
@@ -612,7 +612,6 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 			return
 		}
 	}
-
 	//如果权限不包含那么直接返回
 	if !strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 		return