Parcourir la source

Merge branch 'needs/default_chart_20230419' into debug

hsun il y a 1 an
Parent
commit
d8c37ac86c
2 fichiers modifiés avec 12 ajouts et 0 suppressions
  1. 4 0
      controller/my_chart/my_chart.go
  2. 8 0
      controller/my_chart/my_chart_classify.go

+ 4 - 0
controller/my_chart/my_chart.go

@@ -41,6 +41,10 @@ func (this *MyChartController) List(c *gin.Context) {
 		cond += ` AND my_chart_classify_id = ?`
 		pars = append(pars, req.ClassifyId)
 	}
+	// classifyId = -1的时候查询默认分类
+	if req.ClassifyId == -1 {
+		cond += ` AND my_chart_classify_id = 0`
+	}
 	pageIndex := services.GetCurrPageByClaims(c)
 	pageSize := services.GetPageSizeByClaims(c)
 

+ 8 - 0
controller/my_chart/my_chart_classify.go

@@ -33,6 +33,14 @@ func (this *MyChartClassifyController) List(c *gin.Context) {
 		return
 	}
 	respList := make([]*responseModel.MyChartClassifyItem, 0)
+	// 新增一个默认分类
+	respList = append(respList, &responseModel.MyChartClassifyItem{
+		MyChartClassifyID:   -1,
+		MyChartClassifyName: "未分类",
+		Sort:                -1,
+		UserID:              userId,
+		CreateTime:          utils.TimeTransferString(utils.FormatDateTime, time.Now().Local()),
+	})
 	for i := range list {
 		respList = append(respList, &responseModel.MyChartClassifyItem{
 			MyChartClassifyID:   list[i].MyChartClassifyID,