no message

controllers/article.go

@@ -770,6 +770,16 @@ func (this *ArticleController) AddStopTime() {
 			}
 			var hasPersion bool
 			slice := strings.Split(articlePermissionPermissionName, ",")
+			//判断用户是否开通了个人研选权限，如果有权限后缀拼接权限名称
+			mfyxUserPermissionTotal := services.GetMfyxUserPermissionTotal(uid)
+			if mfyxUserPermissionTotal == 1 {
+				companyPermission += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+				companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
+			}
+			//如果有研选订阅的权限，那么就拼接一个 买方研选的权限做校验
+			if strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_MF_YANXUAN) {
+				companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
+			}
 			for _, v := range slice {
 				if strings.Contains(companyPermission, v) {
 					hasPersion = true

controllers/yanxuan_special.go

@@ -636,7 +636,7 @@ func (this *YanxuanSpecialController) Collect() {
 	if req.Status == 1 {
 		sellerItem, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
 		if err != nil {
-			br.Msg = "报名失败！"
+			br.Msg = "收藏失败！"
 			br.ErrMsg = "获取对应销售失败，Err:" + err.Error()
 			return
 		}
@@ -664,8 +664,8 @@ func (this *YanxuanSpecialController) Collect() {
 	} else {
 		err = models.DelCygxYanxuanSpecialCollect(user.UserId, req.Id)
 		if err != nil {
-			br.Msg = "删除失败"
-			br.ErrMsg = "删除失败，Err:" + err.Error()
+			br.Msg = "取消收藏失败"
+			br.ErrMsg = "取消收藏失败，Err:" + err.Error()
 			return
 		}
 		br.Msg = "取消收藏成功"

services/resource_data.go

@@ -301,6 +301,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		for _, v := range listyanxuanSpecial {
 			v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
 			v.Annotation, _ = GetReportContentTextSubNew(v.Content)
+			v.LabelKeywordImgLink = utils.LABEL_ICO_4
 			mapItems[fmt.Sprint(utils.CYGX_OBJ_YANXUANSPECIAL, v.Id)].YanxuanSpecial = v
 		}
 	}