xingzai 1 rok pred
rodič
commit
e3115dfdd8
1 zmenil súbory, kde vykonal 14 pridanie a 5 odobranie
  1. 14 5
      controllers/article.go

+ 14 - 5
controllers/article.go

@@ -255,10 +255,15 @@ func (this *ArticleNoLoginController) Detail() {
 			}
 		}
 	} else { //潜在客户
-		if applyCount > 0 {
-			hasPermission = 6
+		mfyxUserPermissionTotal := services.GetMfyxUserPermissionTotal(uid)
+		if mfyxUserPermissionTotal == 1 {
+			hasPermission = 1
 		} else {
-			hasPermission = 7
+			if applyCount > 0 {
+				hasPermission = 6
+			} else {
+				hasPermission = 7
+			}
 		}
 	}
 Loop:
@@ -735,8 +740,9 @@ func (this *ArticleController) AddStopTime() {
 		br.ErrMsg = "判断是否已申请过试用失败,Err:" + err.Error()
 		return
 	}
+	mfyxUserPermissionTotal := services.GetMfyxUserPermissionTotal(uid)
 	//`description:"1:有该行业权限,正常展示,2:无该行业权限,不存在权益客户下,3:无该品类权限,4:潜在客户,未提交过申请,5:潜在客户,已提交过申请"`
-	if user.CompanyId > 1 {
+	if user.CompanyId > 1 || mfyxUserPermissionTotal == 1 {
 		companyPermission, err := models.GetCompanyPermission(user.CompanyId)
 		if err != nil {
 			br.Msg = "获取信息失败"
@@ -749,6 +755,9 @@ func (this *ArticleController) AddStopTime() {
 			br.ErrMsg = "获取文章信息失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
 			return
 		}
+		if mfyxUserPermissionTotal == 1 {
+			companyPermission = utils.CHART_PERMISSION_NAME_MF_YANXUAN
+		}
 		if companyPermission == "" {
 			if applyCount > 0 {
 				hasPermission = 5
@@ -779,7 +788,7 @@ 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