Merge branch 'eta_classify_bug_1025@guomengyuan' into debug

services/classify.go

@@ -290,7 +290,7 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 		return err, "查询分类下所有的分类记录数失败", false
 	}
 
-	if count <= 0 {
+	if count == 1 {
 		// 如果父级分类下 无其他子分类 并且有报告，修改报告到子级分类下
 		reports, err := models.GetReportListByClassifyId(parentId)
 		if err != nil {
@@ -298,13 +298,11 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 		}
 		if len(reports) > 0 {
 			for _, report := range reports {
-				if report.ClassifyIdFirst == 0 {
-					report.ClassifyIdFirst = classify.Id
-					report.ClassifyNameFirst = classifyName
-				} else if report.ClassifyIdSecond == 0 {
+				// 一级分类不用判断，有报告一定有分类，二级分类如果等于0，就不用判断三级了
+				if report.ClassifyIdSecond == 0 {
 					report.ClassifyIdSecond = classify.Id
 					report.ClassifyNameSecond = classifyName
-				} else {
+				} else if report.ClassifyIdThird == 0 {
 					report.ClassifyIdThird = classify.Id
 					report.ClassifyNameThird = classifyName
 				}