fix

controllers/report_v2.go

@@ -793,6 +793,50 @@ func (this *ReportController) Detail() {
 
 	}
 
+	classifyMap := make(map[int]*models.Classify) // 分类map
+	classifyIdList := make([]int, 0)
+
+	if item.ClassifyIdFirst > 0 {
+		classifyIdList = append(classifyIdList, item.ClassifyIdFirst)
+	}
+	if item.ClassifyIdSecond > 0 {
+		classifyIdList = append(classifyIdList, item.ClassifyIdSecond)
+	}
+	if item.ClassifyIdThird > 0 {
+		classifyIdList = append(classifyIdList, item.ClassifyIdThird)
+	}
+
+	if len(classifyIdList) > 0 {
+		classifyList, e := models.GetClassifyListByIdList(classifyIdList)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取报告分类失败, Err: " + e.Error()
+			return
+		}
+		for _, v := range classifyList {
+			classifyMap[v.Id] = v
+		}
+		if item.ClassifyIdThird > 0 {
+			if classify, ok := classifyMap[item.ClassifyIdThird]; ok {
+				if classify.Enabled == 1 {
+					item.ClassifyEnabled = true
+				}
+			}
+		} else if item.ClassifyIdSecond > 0 {
+			if classify, ok := classifyMap[item.ClassifyIdSecond]; ok {
+				if classify.Enabled == 1 {
+					item.ClassifyEnabled = true
+				}
+			}
+		} else if item.ClassifyIdFirst > 0 {
+			if classify, ok := classifyMap[item.ClassifyIdFirst]; ok {
+				if classify.Enabled == 1 {
+					item.ClassifyEnabled = true
+				}
+			}
+		}
+	}
+
 	resp := &models.ReportDetailView{
 		ReportDetail: item,
 		ChapterList:  chapterList,
@@ -960,17 +1004,17 @@ func (this *ReportController) AuthorizedListReport() {
 	var list []*models.ReportList
 
 	// 没有输入信息，那就不展示
-	if keyword == `` && classifyIdFirst <= 0 {
-		page := paging.GetPaging(currentIndex, pageSize, 0)
-		resp := new(models.ReportListResp)
-		resp.Paging = page
-		resp.List = list
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = resp
-		return
-	}
+	//if keyword == `` && classifyIdFirst <= 0 {
+	//	page := paging.GetPaging(currentIndex, pageSize, 0)
+	//	resp := new(models.ReportListResp)
+	//	resp.Paging = page
+	//	resp.List = list
+	//	br.Ret = 200
+	//	br.Success = true
+	//	br.Msg = "获取成功"
+	//	br.Data = resp
+	//	return
+	//}
 
 	// 当前用户有权限的报告id列表
 	grantReportIdList := make([]int, 0)

models/classify.go

@@ -762,8 +762,8 @@ func GetClassifyListByParentId(parentId int) (items []*Classify, err error) {
 // @return list []*Classify
 // @return err error
 func GetAllEnabledClassify() (list []*Classify, err error) {
-	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM classify WHERE enabled = 1`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DbMap[utils.DbNameReport].Raw(sql).Find(&list).Error
+
 	return
 }

models/report.go

@@ -445,6 +445,7 @@ type ReportDetail struct {
 	ReportLayout        int8      `description:"报告布局，1：常规布局，2：智能布局。默认：1"`
 	IsPublicPublish     int8      `description:"是否公开发布，1：是，2：否"`
 	ReportCreateTime    time.Time `description:"报告时间创建时间"`
+	ClassifyEnabled     bool      `description:"分类是否禁用"`
 }
 
 func (m *ReportDetail) AfterFind(db *gorm.DB) (err error) {

services/document_manage_service/document_manage_service.go

@@ -287,6 +287,63 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird int, cha
 		return nil, err
 	}
 
+	listLen := len(reportList)
+	if listLen > 0 {
+		classifyIdList := make([]int, 0)              // 关联的指标分类id
+		classifyIdMap := make(map[int]bool)           // 分类id map
+		classifyMap := make(map[int]*models.Classify) // 分类map
+
+		for i := 0; i < listLen; i++ {
+			if reportList[i].ClassifyIdFirst > 0 {
+				if _, ok := classifyIdMap[reportList[i].ClassifyIdFirst]; !ok {
+					classifyIdList = append(classifyIdList, reportList[i].ClassifyIdFirst)
+				}
+			}
+			if reportList[i].ClassifyIdSecond > 0 {
+				if _, ok := classifyIdMap[reportList[i].ClassifyIdSecond]; !ok {
+					classifyIdList = append(classifyIdList, reportList[i].ClassifyIdSecond)
+				}
+			}
+			if reportList[i].ClassifyIdThird > 0 {
+				if _, ok := classifyIdMap[reportList[i].ClassifyIdThird]; !ok {
+					classifyIdList = append(classifyIdList, reportList[i].ClassifyIdThird)
+				}
+			}
+		}
+
+		if len(classifyIdList) > 0 {
+			classifyList, e := models.GetClassifyListByIdList(classifyIdList)
+			if e != nil {
+				return &reportPage, e
+			}
+			for _, v := range classifyList {
+				classifyMap[v.Id] = v
+			}
+		}
+
+		for i := 0; i < listLen; i++ {
+			if reportList[i].ClassifyIdThird > 0 {
+				if classify, ok := classifyMap[reportList[i].ClassifyIdThird]; ok {
+					if classify.Enabled == 1 {
+						reportList[i].ClassifyEnabled = true
+					}
+				}
+			} else if reportList[i].ClassifyIdSecond > 0 {
+				if classify, ok := classifyMap[reportList[i].ClassifyIdSecond]; ok {
+					if classify.Enabled == 1 {
+						reportList[i].ClassifyEnabled = true
+					}
+				}
+			} else if reportList[i].ClassifyIdFirst > 0 {
+				if classify, ok := classifyMap[reportList[i].ClassifyIdFirst]; ok {
+					if classify.Enabled == 1 {
+						reportList[i].ClassifyEnabled = true
+					}
+				}
+			}
+		}
+	}
+
 	reportPage.Paging = page
 	reportPage.List = reportList