|
@@ -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{}{}
|