Browse Source

fix:pdf报告权限

zqbao 7 months ago
parent
commit
79f2aa7d3f
2 changed files with 3 additions and 3 deletions
  1. 2 2
      controllers/report.go
  2. 1 1
      models/chart_permission.go

+ 2 - 2
controllers/report.go

@@ -317,7 +317,7 @@ func (this *ReportController) PdfDetail() {
 
 	// 有效期是否到期
 	var vailStatus int
-	if user.Status == utils.UserStatusFormal || user.Status == utils.UserStatusNo {
+	if user.Status == utils.UserStatusFormal {
 		if user.ValidEndTime.After(time.Now()) && user.ValidStartTime.Before(time.Now()) {
 			vailStatus = 2
 		} else {
@@ -362,7 +362,7 @@ func (this *ReportController) PdfDetail() {
 	var IsPublic bool
 	permissionMap := make(map[int]struct{})
 	for _, v := range permissionResp.Data {
-		if v.ChartPermissionId == 1 {
+		if v.IsPublic == 1 {
 			IsPublic = true
 		}
 		permissionMap[v.ChartPermissionId] = struct{}{}

+ 1 - 1
models/chart_permission.go

@@ -11,7 +11,7 @@ type ChartPermissionView struct {
 }
 
 type ChartPermission struct {
-	ChartPermissionId   int       `description:"问题ID"`
+	ChartPermissionId   int       `description:"品种ID"`
 	ChartPermissionName string    `description:"名称"`
 	PermissionName      string    `description:"权限名"`
 	Sort                int       `description:"排序"`