过滤目录

controllers/chart_classify.go

@@ -202,7 +202,13 @@ func (this *ChartClassifyController) SimpleList() {
 
 	if reqParentId >= 0 {
 		// 查询挂在当前分类上的图表列表
-		allChartInfo, e := models.GetChartInfoAllByClassifyId(utils.CHART_SOURCE_DEFAULT, parentId)
+		var e error
+		allChartInfo := make([]*models.ChartClassifyItems, 0)
+		if len(adminIdsSlice) > 0 {
+			allChartInfo, e = models.GetChartInfoAllByClassifyIdAndAdmin(utils.CHART_SOURCE_DEFAULT, parentId, adminIdsSlice)
+		} else {
+			allChartInfo, e = models.GetChartInfoAllByClassifyId(utils.CHART_SOURCE_DEFAULT, parentId)
+		}
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败，Err:" + e.Error()

main.go

@@ -1,7 +1,10 @@
 package main
 
 import (
+	"context"
+	"eta/eta_forum_admin/models/mgodb"
 	_ "eta/eta_forum_admin/routers"
+	"fmt"
 	beego "github.com/beego/beego/v2/server/web"
 )
 
@@ -12,4 +15,10 @@ func main() {
 	}
 
 	beego.Run()
+	defer func() {
+		fmt.Println("mongodb disconnect")
+		if err := mgodb.MgoClient.Disconnect(context.TODO()); err != nil {
+			panic(err)
+		}
+	}()
 }

models/chart_info.go

@@ -1815,11 +1815,22 @@ func GetChartInfoAllByClassifyId(source, classifyId int) (items []*ChartClassify
 	o := orm.NewOrm()
 	sql := ` SELECT chart_info_id,chart_classify_id,chart_name AS chart_classify_name,chart_name_en AS chart_classify_name_en,
              unique_code,sys_user_id,sys_user_real_name,date_type,start_date,end_date,chart_type,calendar,season_start_date,season_end_date,is_join_permission
-            FROM chart_info WHERE chart_classify_id = ? AND source = ?  ORDER BY sort asc,create_time DESC `
+            FROM chart_info WHERE chart_classify_id = ? AND source = ? ORDER BY sort asc,create_time DESC `
 	_, err = o.Raw(sql, classifyId, source).QueryRows(&items)
 	return
 }
 
+// GetChartInfoAll 用于分类展示
+// @param source int 1：ETA图库；2：商品价格曲线
+func GetChartInfoAllByClassifyIdAndAdmin(source, classifyId int, adminIds []int) (items []*ChartClassifyItems, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT chart_info_id,chart_classify_id,chart_name AS chart_classify_name,chart_name_en AS chart_classify_name_en,
+             unique_code,sys_user_id,sys_user_real_name,date_type,start_date,end_date,chart_type,calendar,season_start_date,season_end_date,is_join_permission
+            FROM chart_info WHERE chart_classify_id = ? AND source = ? AND sys_user_id in (` + utils.GetOrmInReplace(len(adminIds)) + `)  ORDER BY sort asc,create_time DESC `
+	_, err = o.Raw(sql, classifyId, source, adminIds).QueryRows(&items)
+	return
+}
+
 func GetChartInfoByClassifyId(source, classifyId, startSize, pageSize int) (items []*ChartClassifyItems, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT chart_info_id,chart_classify_id,chart_name AS chart_classify_name,chart_name_en AS chart_classify_name_en,