diff --git a/src/controller/work_order_manage.go b/src/controller/work_order_manage.go index df57112c1098b1695e59ddf8101379e101de7e8c..ec1eacd86c8e6ab82f4aa7295a7c0dea9f816578 100644 --- a/src/controller/work_order_manage.go +++ b/src/controller/work_order_manage.go @@ -259,6 +259,15 @@ func WorkOrderListAlert(c *gin.Context) { } svc := service.AlertSvc{User: user} data, err := svc.List(req) + // 回显使用:内部字段对外覆盖处理 + // disposed_list[].is_disposed --映射--> is_disposed + for i := 0; i < len(data.List); i++ { + for j := 0; j < len(data.List[i].DisposedList); j++ { + if data.List[i].DisposedList[j].DisposalUser == user.SystemAccount { + data.List[i].IsDisposed = 1 + } + } + } if err != nil { SendJsonResponse(c, resp.FAIL.WithError(err), nil) return diff --git a/src/service/alert.go b/src/service/alert.go index 9518bac999a6da79990b80137fcb051397f078e4..5665d6a718c2c384f89dd7b665b54249eeca06b3 100644 --- a/src/service/alert.go +++ b/src/service/alert.go @@ -456,7 +456,7 @@ func (a *AlertSvc) DocSearch(req request.ListAlert) (resp response.AlertList, er for _, hit := range sources.Hits.Hits { resp.List = append(resp.List, hit.Source) } - resp.TotalCount = int64(len(resp.List)) + resp.TotalCount = int64(sources.Hits.Total.Value) return } @@ -838,12 +838,10 @@ func (a *AlertSvc) GetDataByAlertRulesIdAndRiskLevel(alertRulesId string, riskLe func (a *AlertSvc) List(req request.ListAlert) (resp response.AlertList, err error) { resp, err = a.DocSearch(req) - resp.TotalCount = int64(len(resp.List)) return } func (a *AlertSvc) DisposeAlert(req request.DisposeAlert) (err error) { - // TODO 我的预警工单处置 var ( sources response.OpenSearchSource now = jsontime.Now()