Merge branch 'needs/chart_switch_20230508' into debug

controller/my_chart/my_chart.go

@@ -391,10 +391,6 @@ func (this *MyChartController) Locate(c *gin.Context) {
 	cond := `user_id = ?`
 	pars := make([]interface{}, 0)
 	pars = append(pars, userId)
-	if req.ClassifyId > 0 {
-		cond += ` AND my_chart_classify_id > 0`
-	}
-
 	ob := new(yb_my_chart.YbMyChart)
 	list, e := ob.List(cond, pars)
 	if e != nil {
@@ -408,7 +404,7 @@ func (this *MyChartController) Locate(c *gin.Context) {
 	}
 
 	// 如果是分类下的图表, 则优先分类排序, 其次分类图表排序
-	if req.ClassifyId > 0 {
+	if req.ClassifyId > 0 || req.ClassifyId == -1 {
 		classifyCond := `user_id = ?`
 		classifyPars := make([]interface{}, 0)
 		classifyPars = append(classifyPars, userId)
@@ -418,6 +414,22 @@ func (this *MyChartController) Locate(c *gin.Context) {
 			response.FailMsg("获取失败", "获取用户图表分类失败, Err: "+e.Error(), c)
 			return
 		}
+		// 未分类的图表排在前面
+		for _, ch := range list {
+			if ch.MyChartClassifyID > 0 {
+				continue
+			}
+			v := new(responseModel.MyChartLocateItem)
+			v.MyChartID = ch.MyChartID
+			v.MyChartClassifyID = -1 // 未分类ID
+			v.ChartInfoID = ch.ChartInfoID
+			v.ChartName = ch.ChartName
+			v.UniqueCode = ch.UniqueCode
+			v.ChartInfoSource = ch.Source
+			charts = append(charts, v)
+		}
+
+		// 已归类的图表
 		for _, cl := range classies {
 			for _, ch := range list {
 				if ch.MyChartClassifyID != cl.MyChartClassifyID {