Merge branch 'eta/1.8.3' into debug

models/response/report.go

@@ -120,6 +120,8 @@ type ReportListItem struct {
 	ClassifyNameFirst  string           `description:"一级分类名称" json:"classify_name_first"`
 	ClassifyIdSecond   int              `description:"二级分类id" json:"classify_id_second"`
 	ClassifyNameSecond string           `description:"二级分类名称" json:"classify_name_second"`
+	ClassifyIdThird    int              `description:"三级分类id" json:"classify_id_third"`
+	ClassifyNameThird  string           `description:"三级分类名称" json:"classify_name_third"`
 	Title              string           `description:"标题" json:"title"`
 	Abstract           string           `description:"摘要" json:"abstract"`
 	Author             string           `description:"作者" json:"author"`
@@ -189,6 +191,8 @@ type EsReportItem struct {
 	ClassifyNameFirst  string `description:"一级分类名称"`
 	ClassifyIdSecond   int    `description:"二级分类id"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类id"`
+	ClassifyNameThird  string `description:"三级分类名称"`
 	PublishState       int    `description:"1:未发布，2:已发布"`
 	PublishTime        string `description:"发布时间"`
 	ReportChapterId    int    `description:"报告章节Id"`

services/company/permission.go

@@ -335,6 +335,12 @@ func GetCheckPermission(companyId int64, userId int, permissionIdList []int) (ok
 		return
 	}
 
+	// 潜在客户名下的
+	if companyId == 1 {
+		permissionCheckInfo.Type = CheckTypeApply
+		return
+	}
+
 	var productId int64
 	productId = 1
 	//查询是否 开通ficc的客户

services/report/report.go

@@ -411,13 +411,16 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	var permissionCheckInfo response.PermissionCheckInfo
 	//var vaildWeekTypeIds []int
 	var reportChapterIdList []int
-	if reportInfo.ClassifyNameFirst == "晨报" {
-		authOk, permissionCheckInfo, err = CheckDayReportPermission(userinfo, productAuthOk)
-	} else if reportInfo.ClassifyNameFirst == "周报" {
-		authOk, permissionCheckInfo, _, reportChapterIdList, err = CheckWeekReportPermission(userinfo, reportId, productAuthOk)
+	if reportInfo.HasChapter == 1 {
+		if reportInfo.ClassifyNameFirst == "晨报" {
+			authOk, permissionCheckInfo, err = CheckDayReportPermission(userinfo, productAuthOk)
+		} else {
+			authOk, permissionCheckInfo, _, reportChapterIdList, err = CheckWeekReportPermission(userinfo, reportId, productAuthOk)
+		}
 	} else {
 		authOk, permissionCheckInfo, err = CheckReportPermission(userinfo, reportId, productAuthOk)
 	}
+
 	if err != nil {
 		return
 	}
@@ -870,6 +873,8 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 				temp.ClassifyNameFirst = reportItem.ClassifyNameFirst
 				temp.ClassifyIdSecond = reportItem.ClassifyIdSecond
 				temp.ClassifyNameSecond = reportItem.ClassifyNameSecond
+				temp.ClassifyIdThird = reportItem.ClassifyIdThird
+				temp.ClassifyNameThird = reportItem.ClassifyNameThird
 				if len(v.Highlight["ClassifyNameSecond"]) > 0 {
 					temp.ClassifyNameSecond = v.Highlight["ClassifyNameSecond"][0]
 				}
@@ -970,6 +975,8 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 			reportItem.ClassifyNameSecond = classifyNameMap[reportInfo.ClassifyIdSecond]
 			reportItem.ClassifyIdFirst = reportInfo.ClassifyIdFirst
 			reportItem.ClassifyIdSecond = reportInfo.ClassifyIdSecond
+			reportItem.ClassifyIdThird = reportInfo.ClassifyIdThird
+			reportItem.ClassifyIdThird = reportInfo.ClassifyIdThird
 			reportItem.Stage = reportInfo.Stage
 			reportItem.Abstract = reportInfo.Abstract
 			if reportInfo.Abstract != "" {
@@ -981,6 +988,9 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 				stageStr = strconv.Itoa(reportInfo.Stage)
 			}
 			reportItem.TitleInfo = fmt.Sprintf("【第%s期|FICC|%s】", stageStr, reportItem.ClassifyNameSecond)
+			if reportItem.ClassifyNameSecond != `` {
+				reportItem.TitleInfo = fmt.Sprintf("%s|%s】", reportItem.TitleInfo, reportItem.ClassifyNameThird)
+			}
 			//trimClassifyNameSecond := utils.TrimHtml(reportInfo.ClassifyNameSecond)
 			if reportItem.ClassifyNameFirst == "晨报" || reportItem.ClassifyNameFirst == "周报" || classifyIdSecond > 0 {
 				//reportItem.ReportImgUrl = utils.ALIYUN_YBIMG_HOST + reportImgUrl