fix: 指标筛选

controllers/data_manage/edb_classify.go

@@ -1164,8 +1164,8 @@ func (this *EdbClassifyController) SimpleList() {
 		}
 
 		for _, v := range rootList {
-			// TODO:(基础指标分类是否加这个判断待定)分类设定了权限且无权限, 那么忽略掉该节点
-			if classifyType == utils.EdbClassifyTypeCalculate && v.IsJoinPermission == 1 && !utils.InArrayByInt(permissionClassifyIdList, v.ClassifyId) {
+			// 分类设定了权限且无权限, 那么忽略掉该节点
+			if v.IsJoinPermission == 1 && !utils.InArrayByInt(permissionClassifyIdList, v.ClassifyId) {
 				continue
 			}
 

controllers/data_manage/edb_info.go

@@ -3537,6 +3537,12 @@ func (this *EdbInfoController) EdbInfoFilterByEs() {
 			condition += ` AND frequency in ("日度","周度","月度") `
 		}
 
+		// 基础指标/计算指标
+		if edbType > 0 {
+			condition += ` AND edb_type = ? `
+			pars = append(pars, edbType)
+		}
+
 		total, edbInfoList, err = data_manage.GetEdbInfoFilterList(condition, pars, startSize, pageSize)
 	}
 	if err != nil {
@@ -3633,9 +3639,17 @@ func (this *EdbInfoController) EdbInfoFilterByEs() {
 		go data_manage.AddSearchKeyword(searchKeyword)
 	}
 
+	// 不返回无权限的指标
+	respList := make([]*data_manage.EdbInfoList, 0)
+	for _, v := range edbInfoList {
+		if v.HaveOperaAuth {
+			respList = append(respList, v)
+		}
+	}
+
 	resp := data_manage.EdbInfoFilterDataResp{
 		Paging: page,
-		List:   edbInfoList,
+		List:   respList,
 	}
 	br.Ret = 200
 	br.Success = true

models/data_manage/edb_collect.go

@@ -237,7 +237,8 @@ ORDER  BY collect_time DESC LIMIT ?,?`, condition)
 
 type CollectEdbInfoQuery struct {
 	EdbInfo
-	CollectClassifyIdStr string `gorm:"column:collect_classify_id" description:"收藏分类ID"`
+	CollectClassifyIdStr string    `gorm:"column:collect_classify_id" description:"收藏分类ID"`
+	CollectTime          time.Time `gorm:"column:collect_time" description:"收藏时间"`
 }
 
 // CollectEdbInfoItem 收藏列表指标信息
@@ -255,6 +256,8 @@ type CollectEdbInfoItem struct {
 	ChartImage            string `description:"图表图片"`
 	ClassifyId            int    `description:"指标分类ID"`
 	CollectClassifyIdList []int  `description:"收藏分类ID列表"`
+	CollectTime           string `description:"收藏时间"`
+	CreateTime            string `description:"创建时间"`
 }
 
 func FormatEdbInfo2CollectItem(origin *CollectEdbInfoQuery) (item *CollectEdbInfoItem) {
@@ -275,7 +278,6 @@ func FormatEdbInfo2CollectItem(origin *CollectEdbInfoQuery) (item *CollectEdbInf
 	if origin.CollectClassifyIdStr != `` {
 		collectClassifyIdStrList := strings.Split(origin.CollectClassifyIdStr, ",")
 		for _, v := range collectClassifyIdStrList {
-			//collectClassifyIdList =
 			collectClassifyId, tmpErr := strconv.Atoi(v)
 			if tmpErr == nil {
 				collectClassifyIdList = append(collectClassifyIdList, collectClassifyId)
@@ -283,6 +285,8 @@ func FormatEdbInfo2CollectItem(origin *CollectEdbInfoQuery) (item *CollectEdbInf
 		}
 	}
 	item.CollectClassifyIdList = collectClassifyIdList
+	item.CollectTime = origin.CollectTime.Format(utils.FormatDateTime)
+	item.CreateTime = origin.CreateTime.Format(utils.FormatDateTime)
 	return
 }