fix:添加pdf品种

controllers/report.go

@@ -359,6 +359,8 @@ func (this *ReportController) PdfDetail() {
 
 // @Title 今日研报列表
 // @Description 今日研报列表
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Success 200 {object} models.ReportDetailResp
 // @router /daily/list [get]
 func (this *ReportController) DailyList() {
@@ -367,7 +369,15 @@ func (this *ReportController) DailyList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
+	// 暂不使用分页
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
 	resp, err := services.GetReportDailyList()
 	if err != nil {
 		br.Msg = "研报列表查询失败"

controllers/user.go

@@ -797,6 +797,19 @@ func (this *UserAuthController) PermissionList() {
 		}
 	}
 	publicView = append(publicView, privateAloneView...)
+	for _, vi := range publicView {
+		vi.ChartPermissionType = utils.PermissionTypeEta
+		for _, vi := range vi.Child {
+			vi.ChartPermissionType = utils.PermissionTypeEta
+		}
+	}
+	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 = "查询成功"
@@ -843,14 +856,16 @@ func (this *UserAuthController) PurchasedPermission() {
 	for _, v := range privateResp.Data {
 		IsAdd := false
 		curPermissionView := &models.ChartPermissionTreeView{
-			ChartPermissionId: v.ChartPermissionId,
-			PermissionName:    v.PermissionName,
-			IsPublic:          v.IsPublic,
-			Sort:              v.Sort,
-			Child:             make([]*models.ChartPermissionTreeView, 0),
+			ChartPermissionId:   v.ChartPermissionId,
+			PermissionName:      v.PermissionName,
+			IsPublic:            v.IsPublic,
+			Sort:                v.Sort,
+			Child:               make([]*models.ChartPermissionTreeView, 0),
+			ChartPermissionType: utils.PermissionTypeEta,
 		}
 		for _, vv := range v.Child {
 			if _, ok := permissionMap[vv.ChartPermissionId]; ok && vv.ParentId != 0 {
+				vv.ChartPermissionType = utils.PermissionTypeEta
 				curPermissionView.Child = append(curPermissionView.Child, vv)
 				IsAdd = true
 			}
@@ -859,6 +874,13 @@ 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,
+	})
 
 	br.Data = privateView
 	br.Msg = "查询成功"

models/chart_permission.go

@@ -32,10 +32,11 @@ type ChartPermissionResp[T any] struct {
 }
 
 type ChartPermissionTreeView struct {
-	ChartPermissionId int                        `description:"权限ID"`
-	PermissionName    string                     `description:"权限名"`
-	Child             []*ChartPermissionTreeView `description:"子权限"`
-	IsPublic          int                        `description:"是否是公有权限1:公有权限，0私有权限"`
-	ParentId          int                        `description:"父级权限id"`
-	Sort              int                        `description:"排序" json:"-"`
+	ChartPermissionId   int                        `description:"权限ID"`
+	PermissionName      string                     `description:"权限名"`
+	Child               []*ChartPermissionTreeView `description:"子权限"`
+	IsPublic            int                        `description:"是否是公有权限1:公有权限，0私有权限"`
+	ParentId            int                        `description:"父级权限id"`
+	Sort                int                        `description:"排序" json:"-"`
+	ChartPermissionType int                        `description:"权限类型:1-eta权限;2-小程序权限"`
 }