Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/article.go

@@ -792,6 +792,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

@@ -1183,17 +1183,17 @@ func (this *YanxuanSpecialController) Check() {
 		br.Success = true
 		br.Msg = "校验成功"
 	}
-	itemToken, err := services.WxGetToken()
+	accessToken, err := services.GetWxAccessTokenByXzs()
 	if err != nil {
 		br.Msg = "GetWxAccessToken Err:" + err.Error()
 		return
 	}
-	if itemToken.AccessToken == "" {
+	if accessToken == "" {
 		br.Msg = "accessToken is empty"
 		return
 	}
 
-	suggest := models.WxCheckContent(itemToken.AccessToken, sysUser.OpenId, req.Content)
+	suggest := models.WxCheckContent(accessToken, sysUser.OpenId, req.Content)
 	if suggest == "risky" {
 		br.Msg = "文章内容含有违法违规内容"
 		br.ErrMsg = "文章内容含有违法违规内容"

services/cygx_yanxuan_special_company.go

@@ -78,10 +78,13 @@ func AddSpecialRecord(user *models.WxUserItem, specialId, stopTime int) (err err
 	var sellerName string
 	//获取销售信息
 	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-	if e != nil {
+	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
 		return
 	}
+	if sellerItem == nil {
+		return
+	}
 	sellerName = sellerItem.RealName
 
 	if stopTime >= 3 {