Browse Source

no message

xingzai 1 year ago
parent
commit
98531ac934
3 changed files with 11 additions and 3 deletions
  1. 1 1
      controllers/activity.go
  2. 2 1
      controllers/article.go
  3. 8 1
      services/activity.go

+ 1 - 1
controllers/activity.go

@@ -519,7 +519,7 @@ func (this *ActivityCoAntroller) Detail() {
 			industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
 			if err != nil {
 				br.Msg = "获取信息失败"
-				br.ErrMsg = "GetActivitySignupResp,Err:" + err.Error()
+				br.ErrMsg = "GetIndustryUserFollowMap,Err:" + err.Error()
 				return
 			}
 			for _, v := range industrialListNew {

+ 2 - 1
controllers/article.go

@@ -261,7 +261,8 @@ func (this *ArticleController) Detail() {
 				br.ErrMsg = "获取用户信息失败,Err:" + err.Error()
 				return
 			}
-			if userType == 1 && strings.Contains(detail.CategoryName, "研选") {
+			//永续客户,无法查看研选权限,但是下面的联系人,单独开通研选后,也可以查看研选内容
+			if userType == 1 && strings.Contains(detail.CategoryName, "研选") && mfyxUserPermissionTotal == 0 {
 				hasPersion = false
 			}
 			//if detail.IsReport == 1 {

+ 8 - 1
services/activity.go

@@ -584,6 +584,13 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	if permissionStr == "" {
 		return
 	}
+
+	//永续客户,无法查看研选权限,但是下面的联系人,单独开通研选后,也可以查看研选内容
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) && mfyxUserPermissionTotal == 0 {
+		havePower = false
+		return
+	}
+
 	permissionStr += "," + utils.HONG_GUAN_NAME // 添加一个宏观权限
 	if permissionStrZhengShi == "" {
 		permissionStrZhengShi = utils.HONG_GUAN_NAME // 添加一个宏观权限
@@ -750,7 +757,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		havePower = true
 	}
 
-	fmt.Println(permissionStrZhengShi)
+	//fmt.Println(permissionStrZhengShi)
 	//if (strings.Contains(activityInfo.ChartPermissionName, "研选") || activityInfo.ChartPermissionName == "策略") && strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 	//	havePower = true
 	//	return