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

models/article_category_mapping.go

@@ -104,3 +104,11 @@ func GetCygxReportMappingCelueMaxDetailByCategoryId(categoryId int) (item *CygxR
 	err = o.Raw(sql, categoryId).QueryRow(&item)
 	return
 }
+
+// 通过 名称获取周期对应的系列详情
+func GetCygxReportMappingCelueDetailByZhoQiCategoryName(categoryName string) (item *CygxReportMappingCelue, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT  * FROM cygx_report_mapping_celue  WHERE  chart_permission_name = '周期' AND  sub_category_name = ? LIMIT 1 `
+	err = o.Raw(sql, categoryName).QueryRow(&item)
+	return
+}

services/ficc_report.go

@@ -115,12 +115,17 @@ func GetReportDetail(userinfo *models.WxUserItem, reportId int) (reportDetail fi
 	if hasPower {
 		hasPermission = 1
 	} else {
-		hasPermission, e = GetUserPermissionCode(userinfo.UserId, userinfo.CompanyId)
-		if e != nil {
-			err = errors.New("GetUserPermissionCode")
-			return
+		if userinfo.UserId == 0 {
+			hasPermission = 1
+		} else {
+			hasPermission, e = GetUserPermissionCode(userinfo.UserId, userinfo.CompanyId)
+			if e != nil {
+				err = errors.New("GetUserPermissionCode")
+				return
+			}
+			reportDetail.SellerName, reportDetail.SellerMobile, _ = GetSellerName(userinfo)
 		}
-		reportDetail.SellerName, reportDetail.SellerMobile, _ = GetSellerName(userinfo)
+
 	}
 	reportDetail.HasPermission = hasPermission
 
@@ -253,6 +258,10 @@ func GetReportDetail(userinfo *models.WxUserItem, reportId int) (reportDetail fi
 		reportItem.VideoUrl = reportInfo.VideoUrl
 	}
 
+	if userinfo.UserId == 0 {
+		reportItem.Content = utils.InterceptHtmlLength(reportInfo.Content, 200)
+	}
+
 	reportDetail.ReportInfo = reportItem
 	reportDetail.ReportChapterList = reportTypeList
 	//reportDetail.PermissionCheck = &permissionCheckInfo
@@ -470,17 +479,10 @@ func GetFiccRreportToCygxArticle() (err error) {
 		item.PublishStatus = 1
 		item.IsReport = 1
 		item.IsClass = 1
-		if (v.ClassifyNameFirst == "宏观报告" && v.ClassifyNameSecond == "大类资产周报") || (v.ClassifyNameFirst == "晨会纪要" && v.ClassifyNameSecond == "晨会纪要") {
-			item.SubCategoryName = "产业跟踪"
-			item.MatchTypeName = "产业跟踪"
 
-			if utils.RunMode == "release" {
-				item.CategoryId = 10091
-				item.CategoryIdTwo = 10091
-			} else {
-				item.CategoryId = 10089
-				item.CategoryIdTwo = 10089
-			}
+		if (v.ClassifyNameFirst == "宏观报告" && v.ClassifyNameSecond == "大类资产周报") || (v.ClassifyNameFirst == "晨会纪要" && v.ClassifyNameSecond == "晨会纪要") || (v.ClassifyNameFirst == "调研纪要" && v.ClassifyNameSecond == "调研纪要") {
+			item.SubCategoryName = v.ClassifyNameSecond
+			item.MatchTypeName = v.ClassifyNameSecond
 		} else if v.ClassifyNameFirst == "调研纪要" && v.ClassifyNameSecond == "调研纪要" {
 			item.SubCategoryName = "调研纪要"
 			item.MatchTypeName = "调研纪要"
@@ -495,6 +497,12 @@ func GetFiccRreportToCygxArticle() (err error) {
 			continue
 		}
 
+		detailCategory, detailCategoryErr := models.GetCygxReportMappingCelueDetailByZhoQiCategoryName(item.SubCategoryName)
+		if detailCategoryErr != nil {
+			continue
+		}
+		item.CategoryId = detailCategory.CategoryId
+		item.CategoryIdTwo = detailCategory.CategoryId
 		var articleIdMax int
 		//如果不存在就新增
 		if mapFiccReport[v.Id] == 0 {
@@ -587,16 +595,20 @@ func GetFiccReportXcxItem(user *models.WxUserItem) (itemSourceResp *models.CygxR
 	if hasPersion {
 		hasPermission = 1
 	} else {
-		itemResp.HasPermission, itemResp.SellerName, itemResp.SellerMobile, _, err = GetUserHasPermissionArticle(user)
-		if err != nil {
-			return
-		}
-		hasPermission, e = GetUserPermissionCode(user.UserId, user.CompanyId)
-		if e != nil {
-			err = errors.New("GetUserPermissionCode")
-			return
+		if user.UserId == 0 {
+			hasPermission = 1
+		} else {
+			itemResp.HasPermission, itemResp.SellerName, itemResp.SellerMobile, _, err = GetUserHasPermissionArticle(user)
+			if err != nil {
+				return
+			}
+			hasPermission, e = GetUserPermissionCode(user.UserId, user.CompanyId)
+			if e != nil {
+				err = errors.New("GetUserPermissionCode")
+				return
+			}
+			itemResp.SellerName, itemResp.SellerMobile, _ = GetSellerName(user)
 		}
-		itemResp.SellerName, itemResp.SellerMobile, _ = GetSellerName(user)
 	}
 
 	itemResp.HasPermission = hasPermission