文档管理-bug修复

models/report.go

@@ -1522,7 +1522,7 @@ func GetReportFieldsByIds(ids []int, fields []string) (items []*Report, err erro
 // GetReportListByClassifyId 根据分类id 获取报告列表
 func GetReportListByClassifyId(classifyId int) (items []*Report, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report WHERE classify_id_first = ? classify_id_second = ? or classify_id_third = ?`
+	sql := `SELECT * FROM report WHERE classify_id_first = ? or classify_id_second = ? or classify_id_third = ?`
 	_, err = o.Raw(sql, classifyId, classifyId, classifyId).QueryRows(&items)
 	return items, err
 }

services/classify.go

@@ -309,8 +309,8 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 		for _, report := range outsideReports {
 			tempReport := report
 
-			report.ClassifyId = classify.Id
-			report.ClassifyName = classifyName
+			tempReport.ClassifyId = classify.Id
+			tempReport.ClassifyName = classifyName
 			// 修改报告
 			err := document_manage_model.UpdateOutsideReport(&tempReport)
 			if err != nil {

services/document_manage_service/document_manage_service.go

@@ -134,11 +134,16 @@ func DocumentReportList(documentType int, chartPermissionIdList []string, classi
 			if err != nil {
 				return nil, err
 			}
-			childenClassifyIdList, err := GetAllClassifyIdsByParentId(id)
-			if err != nil {
-				return nil, err
+
+			if id == 0 {
+				classifyIdList = append(classifyIdList, classifyId)
+			} else {
+				childrenClassifyIdList, err := GetAllClassifyIdsByParentId(id)
+				if err != nil {
+					return nil, err
+				}
+				classifyIdList = append(classifyIdList, childrenClassifyIdList...)
 			}
-			classifyIdList = append(classifyIdList, childenClassifyIdList...)
 		}
 		condition += ` and t1.classify_id in (` + utils.GetOrmInReplace(len(classifyIdList)) + `)`
 		for _, classifyId := range classifyIdList {