Эх сурвалжийг харах

Merge branch 'dev' of http://git.cestong.com.cn/cecf/observe-server into dev

路佳明 1 сар өмнө
parent
commit
bb61e74904

+ 3 - 1
app/observe/service/event.go

@@ -22,8 +22,10 @@ func (e *Event) GetPage(c *dto.EventListReq, result *[]dto.EventListResp, count
 	if c.AppId > 0 {
 		db.Where("AppId", c.AppId)
 	}
-	if c.AlertStatus == 2 || c.AlertStatus == 4 {
+	if c.AlertStatus == 2 {
 		db.Where("AlertStatus", c.AlertStatus)
+	} else if c.AlertStatus == 4 {
+		db.Where("AlertStatus >=?", c.AlertStatus)
 	}
 	// db.Scopes(cDto.MakeCondition(*c))
 	if c.StartTime > 0 {