Merge branch 'bzq/dev' of eta_mini/eta_mini_api into debug

controllers/report.go

@@ -587,6 +587,8 @@ func (this *ReportController) Search() {
 			Abstract:            v.Abstract,
 			Stage:               v.Stage,
 			Author:              v.Author,
+			PdfUrl:              v.PdfUrl,
+			ReportType:          v.ReportType,
 		}
 		if v.PublishTime.IsZero() {
 			tmpReport.PublishTime = ""

controllers/user.go

@@ -807,14 +807,14 @@ func (this *UserAuthController) PermissionList() {
 		for _, vi := range vi.Child {
 			vi.ChartPermissionType = utils.PermissionTypeEta
 		}
+		vi.Child = append(vi.Child, &models.ChartPermissionTreeView{
+			ChartPermissionId:   1,
+			PermissionName:      utils.MINI_CUSTOM_PERMISSION_NAME,
+			IsPublic:            0,
+			Sort:                0,
+			ChartPermissionType: utils.ReportTypePdf,
+		})
 	}
-	publicView = append(publicView, &models.ChartPermissionTreeView{
-		ChartPermissionId:   1,
-		PermissionName:      utils.MINI_CUSTOM_PERMISSION_NAME,
-		IsPublic:            0,
-		Sort:                0,
-		ChartPermissionType: utils.ReportTypePdf,
-	})
 
 	br.Data = publicView
 	br.Msg = "查询成功"
@@ -879,13 +879,15 @@ func (this *UserAuthController) PurchasedPermission() {
 			privateView = append(privateView, curPermissionView)
 		}
 	}
-	privateView = append(privateView, &models.ChartPermissionTreeView{
-		ChartPermissionId:   1,
-		PermissionName:      utils.MINI_CUSTOM_PERMISSION_NAME,
-		IsPublic:            0,
-		Sort:                0,
-		ChartPermissionType: utils.ReportTypePdf,
-	})
+	for _, vi := range privateView {
+		vi.Child = append(vi.Child, &models.ChartPermissionTreeView{
+			ChartPermissionId:   1,
+			PermissionName:      utils.MINI_CUSTOM_PERMISSION_NAME,
+			IsPublic:            0,
+			Sort:                0,
+			ChartPermissionType: utils.ReportTypePdf,
+		})
+	}
 
 	br.Data = privateView
 	br.Msg = "查询成功"

models/response/report.go

@@ -39,6 +39,8 @@ type ReportCollectListItem struct {
 	Abstract            string    `description:"摘要"`
 	Stage               string    `description:"期数"`
 	Author              string    `description:"作者"`
+	PdfUrl              string    `description:"pdf文件url"`
+	ReportType          int       `description:"报告类型:1:eta报告，2:小程序pdf报告"`
 }
 
 type ReportSearchListView struct {
@@ -55,6 +57,8 @@ type ReportSearchListView struct {
 	Abstract            string `description:"摘要"`
 	Stage               string `description:"期数"`
 	Author              string `description:"作者"`
+	PdfUrl              string `description:"pdf文件url"`
+	ReportType          int    `description:"报告类型:1:eta报告，2:小程序pdf报告"`
 }
 
 type ReportSearchResp struct {