Merge branch 'fixbug_7814_export_manual_data' into debug

controllers/target.go

@@ -1019,14 +1019,14 @@ func (this *TargetController) ExportDataList() {
 	}
 
 	childClassifyIdList := make([]int, 0)
+
+	// 获取有用权限的分类
+	classifyList, err := models.GetEdbdataClassify(int64(permissionUserId))
+	if err != nil {
+		return
+	}
 	// 所属分类
 	if classifyId > 0 {
-		// 获取有用权限的分类
-		classifyList, err := models.GetEdbdataClassify(int64(permissionUserId))
-		if err != nil {
-			return
-		}
-
 		var isParent bool
 		for _, v := range classifyList {
 			if v.ClassifyId == classifyId {
@@ -1040,11 +1040,17 @@ func (this *TargetController) ExportDataList() {
 				break
 			}
 		}
-
 		// 如果是最小级，那么就把自己放进去
 		if !isParent {
 			childClassifyIdList = append(childClassifyIdList, classifyId)
 		}
+	} else {
+		for _, classify := range classifyList {
+			childClassifyIdList = append(childClassifyIdList, classify.ClassifyId)
+			for _, sub := range classify.Child {
+				childClassifyIdList = append(childClassifyIdList, sub.ClassifyId)
+			}
+		}
 	}
 
 	// 如果所选分类是一级时，那么是一级下的所有分类；如果是二级时，那么是二级自己本身