Merge branch 'cygx_13.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/article.go

@@ -215,6 +215,11 @@ func (this *ArticleController) Detail() {
 		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
 		}
 
 		if companyPermission == "" {

utils/constants.go

@@ -79,6 +79,7 @@ const (
 
 const (
 	CHART_PERMISSION_NAME_YANXUAN    string = "研选"
+	MAI_FANG_YAN_XUAN_NAME           string = "买方研选"
 	CHART_PERMISSION_NAME_MF_YANXUAN string = "研选订阅"
 	CHART_PERMISSION_ID_YANXUAN      int    = 31      //权限研选订阅id
 	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52      //研选扣点包ID