|
|
@@ -379,7 +379,7 @@ func (this *ReportController) PdfDetail() {
|
|
|
resp := new(response.ReportPdfDetailResp)
|
|
|
if !IsPublic {
|
|
|
// 如果是私有报告，用户权限过期直接返回有效期已过
|
|
|
- if vailStatus == 1 {
|
|
|
+ if vailStatus == 1 || user.Status == utils.UserStatusNo {
|
|
|
resp.Report = reportPdf
|
|
|
resp.Status = utils.ReportPermissionStatusExpired
|
|
|
br.Ret = 200
|
|
|
@@ -388,7 +388,7 @@ func (this *ReportController) PdfDetail() {
|
|
|
return
|
|
|
}
|
|
|
// 如果被禁用或是潜在用户，直接返回无阅读报告权限
|
|
|
- if user.Status == utils.UserStatusNo || user.Status == utils.UserStatusPotential {
|
|
|
+ if user.Status == utils.UserStatusPotential {
|
|
|
resp.Report = reportPdf
|
|
|
resp.Status = utils.ReportPermissionStatusNo
|
|
|
br.Ret = 200
|
|
|
@@ -396,6 +396,7 @@ func (this *ReportController) PdfDetail() {
|
|
|
br.Msg = "用户权限不足"
|
|
|
return
|
|
|
}
|
|
|
+ // 正式用户，判断是否有权限查看
|
|
|
userChartPermissionIds, err := models.GetUserChartPermissionIdByUserId(user.UserId)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取用户权限失败"
|
|
|
@@ -404,7 +405,7 @@ func (this *ReportController) PdfDetail() {
|
|
|
}
|
|
|
if len(userChartPermissionIds) == 0 {
|
|
|
resp.Report = reportPdf
|
|
|
- resp.Status = utils.ReportPermissionStatusNo
|
|
|
+ resp.Status = utils.ReportPermissionStatusNoPermission
|
|
|
br.Ret = 200
|
|
|
br.Data = resp
|
|
|
br.Msg = "用户权限不足"
|
zqbao