ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

fix(#13):修复历史电费核算时未选择园区时显示园区中的数据，选中某一园区时显示不同园区的数据

Browse Source
This commit is contained in:
DEKA_123
2023-08-10 14:54:12 +08:00
parent a34aa6ad07
commit 6289257ac1
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controller/report.go
View File

@@ -396,7 +396,7 @@ func reportComprehensiveSearch(c *fiber.Ctx) error {
reportLog.Error("无法获取当前用户的会话信息", zap.Error(err))
return result.Unauthorized("无法获取当前用户的会话信息。")
}
park := tools.EmptyToNil(c.Query("park_id"))
park := tools.EmptyToNil(c.Query("park"))
if session.Type == model.USER_TYPE_ENT && park != nil && len(*park) > 0 {
if pass, err := checkParkBelongs(*park, reportLog, c, &result); !pass {
return err
@@ -420,7 +420,6 @@ func reportComprehensiveSearch(c *fiber.Ctx) error {
reportLog.Error("无法解析核算报表查询的结束日期", zap.Error(err))
return result.BadRequest("无法解析核算报表查询的结束日期。")
}
reports, total, err := service.ReportService.QueryReports(requestUser, park, uint(page), keyword, startDate, endDate)
if err != nil {
reportLog.Error("无法查询核算报表", zap.Error(err))