PDF水印下载限制修改

controllers/activity.go

@@ -259,13 +259,16 @@ func (this *ActivityCoAntroller) ActivityList() {
 
 	//判断客户规模是否属于可见范围的活动
 	companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-	if err != nil {
+	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 		return
 	}
-	if companyProduct.Scale != "" {
-		conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+
+	if companyProduct != nil {
+		if companyProduct.Scale != "" {
+			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+		}
 	}
 
 	condition += ` AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
@@ -661,16 +664,19 @@ func (this *ActivityCoAntroller) Detail() {
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 			return
 		}
+
 		//获取用户的产业规模，判断是否允许可见
 		companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 			return
 		}
-		if companyProduct.Scale != "" {
-			if strings.Count(activityInfo.Scale, companyProduct.Scale) > 0 {
-				noPower = false
+		if companyProduct != nil {
+			if companyProduct.Scale != "" {
+				if strings.Count(activityInfo.Scale, companyProduct.Scale) > 0 {
+					noPower = false
+				}
 			}
 		}
 		if noPower {
@@ -2292,13 +2298,16 @@ func (this *ActivityCoAntroller) LabelTypeList() {
 		}
 		//判断客户规模是否属于可见范围的活动
 		companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 			return
 		}
-		if companyProduct.Scale != "" {
-			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+
+		if companyProduct != nil {
+			if companyProduct.Scale != "" {
+				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+			}
 		}
 
 		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
@@ -2452,13 +2461,16 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 	}
 	//判断客户规模是否属于可见范围的活动
 	companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-	if err != nil {
+	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 		return
 	}
-	if companyProduct.Scale != "" {
-		conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+
+	if companyProduct != nil {
+		if companyProduct.Scale != "" {
+			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+		}
 	}
 	condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
 
@@ -2653,13 +2665,15 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	}
 	//判断客户规模是否属于可见范围的活动
 	companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-	if err != nil {
+	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 		return
 	}
-	if companyProduct.Scale != "" {
-		conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+	if companyProduct != nil {
+		if companyProduct.Scale != "" {
+			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+		}
 	}
 
 	condition += ` AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
@@ -2897,13 +2911,15 @@ func (this *ActivityCoAntroller) LabelTypeListPc() {
 		}
 		//判断客户规模是否属于可见范围的活动
 		companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 			return
 		}
-		if companyProduct.Scale != "" {
-			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+		if companyProduct != nil {
+			if companyProduct.Scale != "" {
+				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+			}
 		}
 		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
 		sortTime = ` mintimesort ASC `

controllers/article.go

@@ -881,7 +881,7 @@ func (this *ArticleController) Pdfwatermark() {
 	//缓存校验
 	cacheKey := fmt.Sprint("xygx:apply_record:add:", uid, "ArticleId_", articleId)
 	ttlTime := utils.Rc.GetRedisTTL(cacheKey)
-	if ttlTime > 0 {
+	if ttlTime > 0 && user.CompanyId != 16 {
 		br.Msg = "下载失败，下载过于频繁"
 		br.ErrMsg = "下载失败，下载过于频繁:mobile" + user.Mobile
 		return