Merge branch 'feature/knowledge' into dm

services/knowledge/resource.go

@@ -425,7 +425,8 @@ func ImportResourceData(path string, resourceType int, sysUser *system.Admin) (s
 			} else if v.StartDate == "" {
 				errTip = "时间未填"
 			}
-		} else {
+		}
+		if errTip == "" {
 			// 判断分类是否存在
 			classifyName := fmt.Sprintf("%s/%s/%s", v.ClassifyFirstName, v.ClassifySecondName, v.ClassifyThirdName)
 			fmt.Println("classifyName: ", classifyName)