fix

controllers/data_manage/chart_classify.go

@@ -945,7 +945,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 
 	isShowMe, _ := this.GetBool("IsShowMe")
 	if isShowMe {
-		allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_DEFAULT}, sysUser.AdminId)
+		allChartInfo, err := data_manage.GetChartInfoByAdminIdAndClassify([]int{utils.CHART_SOURCE_DEFAULT}, sysUser.AdminId, chartClassifyId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取全部数据失败，Err:" + err.Error()

controllers/data_manage/predict_edb_classify.go

@@ -600,8 +600,6 @@ func (this *PredictEdbClassifyController) ListV2() {
 						}
 						button := data.GetPredictEdbOpButton(this.SysUser, v.SysUserId)
 						button.AddButton = false //不管有没有权限，指标都是没有添加按钮的
-						button.OpButton = false
-						button.DeleteButton = false
 						existItem.Button = button
 						if isOnlyMe {
 							if existItem.SysUserId == this.SysUser.AdminId {

models/data_manage/chart_info.go

@@ -1733,4 +1733,19 @@ func FIXChartClassifyId(newId, oldId int) (err error) {
 	sql := ` UPDATE chart_info SET chart_classify_id=? WHERE chart_classify_id=? `
 	_, err = o.Raw(sql, newId, oldId).Exec()
 	return
+}
+
+// GetChartInfoByAdminIdAndClassify 获取所有我创建的图表，用于分类展示
+func GetChartInfoByAdminIdAndClassify(sourceList []int, adminId, classifyId int) (items []*ChartClassifyItems, err error) {
+	num := len(sourceList)
+	if num <= 0 {
+		return
+	}
+
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT chart_info_id,chart_classify_id,chart_name AS chart_classify_name,
+             unique_code,sys_user_id,sys_user_real_name,date_type,start_date,end_date,chart_type,calendar,season_start_date,season_end_date
+            FROM chart_info where source in (` + utils.GetOrmInReplace(num) + `)  AND sys_user_id = ? AND chart_classify_id = ? ORDER BY sort asc,create_time ASC `
+	_, err = o.Raw(sql, sourceList, adminId, classifyId).QueryRows(&items)
+	return
 }