Merge branch 'feature/forum3_chart_classify' into debug

controllers/data_manage/chart_classify.go

@@ -936,10 +936,12 @@ func (this *ChartClassifyController) ChartClassifyMove() {
 		}
 		//更新分类的level_path
 		if oldParentId != req.ParentClassifyId {
-			if err = data.UpdateChartClassifyLevelPathWithChildren(chartClassifyInfo, parentChartClassifyInfo, oldParentId, oldLevelPath); err != nil {
-				br.Msg = "移动失败"
-				br.ErrMsg = "更新分类level_path失败,Err:" + err.Error()
-				return
+			if oldLevelPath != "" {
+				if err = data.UpdateChartClassifyLevelPathWithChildren(chartClassifyInfo, parentChartClassifyInfo, oldParentId, oldLevelPath); err != nil {
+					br.Msg = "移动失败"
+					br.ErrMsg = "更新分类level_path失败,Err:" + err.Error()
+					return
+				}
 			}
 		}
 		if chartClassifyInfo.Source == utils.CHART_SOURCE_DEFAULT {

models/data_manage/chart_classify.go

@@ -475,10 +475,10 @@ func GetChartClassifyInfoSelectedBySource(source int) (items []*ChartClassify, e
 	return
 }
 
-func GetChartClassifyByLevelPath(levelPath string) (items []*ChartClassify, err error) {
+func GetChartClassifyByLevelPath(levelPath string, source int) (items []*ChartClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM chart_classify where level_path like '` + levelPath + `%'`
-	_, err = o.Raw(sql).QueryRows(&items)
+	sql := `SELECT * FROM chart_classify where level_path like '` + levelPath + `%' and source = ?`
+	_, err = o.Raw(sql, source).QueryRows(&items)
 	return
 }
 

services/data/chart_classify.go

@@ -316,6 +316,7 @@ func AddChartClassify(chartClassifyName string, parentId, level, source int, lan
 	}
 	updateCols = append(updateCols, "LevelPath")
 	classifyInfo.LevelPath = levelPath
+	classifyInfo.ChartClassifyId = int(newId)
 	err = classifyInfo.Update(updateCols)
 	if err != nil {
 		errMsg = "更新分类失败"
@@ -498,7 +499,7 @@ func UpdateChartClassifyLevelPathWithChildren(chartClassifyInfo *data_manage.Cha
 	}
 
 	// 更新子分类的levelpath
-	tmpList, err := data_manage.GetChartClassifyByLevelPath(oldLevelPath)
+	tmpList, err := data_manage.GetChartClassifyByLevelPath(oldLevelPath, chartClassifyInfo.Source)
 	if err != nil {
 		return fmt.Errorf("保存分类失败,Err:" + err.Error())
 	}