~suntianyu/webserver.git

			@@ -101,6 +101,15 @@

			gteDate := searchTime[0]
			lteDate := searchTime[1]

			//判断人员ID
			personIdStr := ""
			personId := searchBody.Id
			if personId != nil && len(personId) > 0 {
			esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
			personIdStr = "{\"terms\":{\"id\":[\"" + esPersonId + "\"]}},"
			}

			//判断任务ID
			taskIdStr := ""
			taskId := searchBody.Tasks
			@@ -108,6 +117,7 @@
			esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
			taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
			}

			//判断摄像机ID
			cameraIdStr := ""
			cameraId := searchBody.TreeNodes
			@@ -158,6 +168,7 @@
			"\"filter\":[" +
			cameraIdStr +
			alarmLevelStr +
			personIdStr +
			taskIdStr +
			isCollectStr +
			esTableIdStr +