分类bug修改

controllers/data_manage/excel/excel_classify.go

@@ -78,31 +78,14 @@ func (this *ExcelClassifyController) List() {
 			classifyMap[v.ParentId] = append(classifyMap[v.ParentId], v)
 		}
 	}
-	// todo 整理第三层
 	//组装三级分类
 	for key, classify := range classifyList {
 		subList, ok := classifyMap[classify.ExcelClassifyId]
-		if ok && classify.Level == 3 {
-			classifyList[key].Children = append(classifyList[key].Children, subList...)
-		}
-	}
-	// todo 整理第二层
-	for key, classify := range classifyList {
-		subList, ok := classifyMap[classify.ExcelClassifyId]
-		// 调用sort.Slice函数，传入切片、比较函数作为参数
-		sort.Slice(subList, func(i, j int) bool { return excel.ExcelClassifyItemBySort(subList[i], subList[j]) })
-		if ok && classify.Level == 2 {
-			classifyList[key].Children = append(classifyList[key].Children, subList...)
-		}
-	}
-	// todo 整理第一层
-	for key, classify := range classifyList {
-		subList, ok := classifyMap[classify.ExcelClassifyId]
-		sort.Slice(subList, func(i, j int) bool { return excel.ExcelClassifyItemBySort(subList[i], subList[j]) })
-		if ok && classify.Level == 1 {
+		if ok {
 			classifyList[key].Children = append(classifyList[key].Children, subList...)
 		}
 	}
+
 	nodeAll := make([]*excel.ExcelClassifyItems, 0)
 	for _, v := range classifyList {
 		if v.ParentId == 0 {
@@ -151,28 +134,14 @@ func (this *ExcelClassifyController) ExcelClassifyItems() {
 			classifyMap[v.ParentId] = append(classifyMap[v.ParentId], v)
 		}
 	}
-	// todo 整理第三层
 	//组装三级分类
 	for key, classify := range classifyList {
 		subList, ok := classifyMap[classify.ExcelClassifyId]
-		if ok && classify.Level == 3 {
-			classifyList[key].Children = append(classifyList[key].Children, subList...)
-		}
-	}
-	// todo 整理第二层
-	for key, classify := range classifyList {
-		subList, ok := classifyMap[classify.ExcelClassifyId]
-		if ok && classify.Level == 2 {
-			classifyList[key].Children = append(classifyList[key].Children, subList...)
-		}
-	}
-	// todo 整理第一层
-	for key, classify := range classifyList {
-		subList, ok := classifyMap[classify.ExcelClassifyId]
-		if ok && classify.Level == 1 {
+		if ok {
 			classifyList[key].Children = append(classifyList[key].Children, subList...)
 		}
 	}
+
 	nodeAll := make([]*excel.ExcelClassifyItems, 0)
 	for _, v := range classifyList {
 		if v.ParentId == 0 {
@@ -242,9 +211,8 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		br.ErrMsg = "查询排序信息失败，Err:" + err.Error()
 		return
 	}
-
+	level := 1
 	// 查询父级分类是否存在
-
 	if req.ParentId > 0 {
 		var parent *excel.ExcelClassify
 		parent, err = excel.GetExcelClassifyById(req.ParentId)
@@ -257,7 +225,10 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 			br.ErrMsg = "查询父级分类信息失败，Err:" + err.Error()
 			return
 		}
-		req.Level = parent.Level + 1
+		if parent.ParentId == 0 && parent.Level == 0 {
+			parent.Level = 1
+		}
+		level = parent.Level + 1
 	}
 	// 入库
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
@@ -268,7 +239,7 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		Source:            source,
 		SysUserId:         this.SysUser.AdminId,
 		SysUserRealName:   this.SysUser.RealName,
-		Level:             req.Level,
+		Level:             level,
 		UniqueCode:        utils.MD5(utils.EXCEL_DATA_PREFIX + "_" + timestamp),
 		Sort:              maxSort + 1,
 		CreateTime:        time.Now(),