Merge branch 'feature/eta_forum3_chart_classify' into debug

controllers/data_manage/chart_classify.go

@@ -427,13 +427,24 @@ func (this *ChartClassifyController) EditChartClassify() {
 	}
 
 	// 编辑图表分类
-	classifyInfo, isDeleteForumChart, err, errMsg, isSendEmail := data.EditChartClassifyV2(req.ChartClassifyId, req.ParentId, utils.CHART_SOURCE_DEFAULT, req.ChartClassifyName, req.IsSelected, this.Lang)
+	classifyInfo, isDeleteForumChart, tipCode, err, errMsg, isSendEmail := data.EditChartClassifyV2(req.ChartClassifyId, req.ParentId, utils.CHART_SOURCE_DEFAULT, req.ChartClassifyName, req.IsSelected, this.Lang)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = "保存分类失败,Err:" + err.Error()
 		br.IsSendEmail = isSendEmail
 		return
 	}
+	var ret data_manage.EditChartClassifyResp
+	if tipCode != "" {
+		br.Ret = 200
+		br.Msg = "该分类下存在已上架的图表，请先将图表从资源库下架，再关闭该精选资源分类。"
+		ret.TipCode = tipCode
+		ret.TipMsg = "该分类下存在已上架的图表，请先将图表从资源库下架，再关闭该精选资源分类。"
+		br.IsSendEmail = false
+		br.Success = true
+		br.Data = ret
+		return
+	}
 
 	// 移除精选后，删除所有的图表
 	if isDeleteForumChart {
@@ -444,6 +455,7 @@ func (this *ChartClassifyController) EditChartClassify() {
 	br.Msg = "保存成功"
 	br.Success = true
 	br.IsAddLog = true
+	br.Data = ret
 }
 
 // @Title 删除图表检测接口

models/data_manage/chart_classify.go

@@ -768,3 +768,7 @@ type ChartClassifyResourceUpdate struct {
 	ChartClassifyId int `description:"分类id"`
 }
 
+type EditChartClassifyResp struct {
+	TipCode          string `description:"提示码"`
+	TipMsg           string `description:"提示信息"`
+}

services/data/chart_classify.go

@@ -1092,7 +1092,7 @@ func UpdateChildClassifySelection(classifyInfo *data_manage.ChartClassify, paren
 }
 
 // 修改图表分类，可以修改父级
-func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyName string, isSelected int, lang string) (classifyInfo *data_manage.ChartClassify, isDeleteForumChart bool, err error, errMsg string, isSendEmail bool) {
+func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyName string, isSelected int, lang string) (classifyInfo *data_manage.ChartClassify, isDeleteForumChart bool, tipCode string, err error, errMsg string, isSendEmail bool) {
 	isSendEmail = true
 	errMsg = "保存失败"
 
@@ -1127,8 +1127,9 @@ func EditChartClassifyV2(chartClassifyId, parentId, source int, chartClassifyNam
 			return
 		}
 		if count > 0 {
-			errMsg = "该分类已经上架的分类，请先下架所有的分类，再取消精选"
-			err = fmt.Errorf("",errMsg)
+			// errMsg = "该分类下存在已经上架的分类，请先下架所有的分类，再取消精选"
+			// err = fmt.Errorf("",errMsg)
+			tipCode = "CHART_CLASSIFY_HAS_UP_CHART"
 			return
 		}
 		isDeleteForumChart = true