|
@@ -152,6 +152,7 @@ func getChildVariety(permissionList []*models.ChartPermission, permissionId int)
|
|
|
permissionVO := models.ChartPermissionVO{
|
|
|
ChartPermissionId: permission.ChartPermissionId,
|
|
|
ChartPermissionName: permission.ChartPermissionName,
|
|
|
+ PermissionName: permission.PermissionName,
|
|
|
ParentId: permission.ParentId,
|
|
|
Enabled: permission.Enabled,
|
|
|
Sort: permission.Sort,
|
|
@@ -213,6 +214,7 @@ func DocumentReportList(documentType int, chartPermissionIdList []string, classi
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
+
|
|
|
reportPage.Paging = page
|
|
|
reportPage.List = outsideReportList
|
|
|
|
|
@@ -244,6 +246,10 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird []string
|
|
|
return nil, err
|
|
|
}
|
|
|
|
|
|
+ for _, report := range reportList {
|
|
|
+ report.ModifyTime = report.ModifyTime.UTC()
|
|
|
+ }
|
|
|
+
|
|
|
reportPage.Paging = page
|
|
|
reportPage.List = reportList
|
|
|
|