diff --git a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java
index 4462df1..c52435b 100644
--- a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java
+++ b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java
@@ -130,6 +130,11 @@ public class AutoCallTaskScheduled {
                     return;
                 }
                 for (AutoCallPerson person : personList) {
+                    AutoCallTask task = autoCallTaskService.getTaskMapper().selectById(taskId);
+                    if (task.getStatus() == AutoCallTask.STATUS_MANUAL_CLOSE || task.getStatus() == AutoCallTask.STATUS_CANCELLED) {
+                        autoCallTaskService.cancelPerson(person);
+                        continue;
+                    }
                     while (person.getUploadedTimes() < 2) {
                         if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break;
                         //do upload
diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java
index 063fe58..08b871d 100644
--- a/src/main/java/com/whdc/controller/QXWarnController.java
+++ b/src/main/java/com/whdc/controller/QXWarnController.java
@@ -149,7 +149,7 @@ public class QXWarnController {
     /**
      * 气象预警-正在生效的预警信息
      *
-     * @param dto
+     * @param
      * @return
      */
     @ApiOperation(value = "气象预警-正在生效的预警信息")
@@ -435,7 +435,7 @@ public class QXWarnController {
         yearDto.setFilter(filter);
         String yearstr = HttpUtil.sendPost(getGroupWarning, JSON.toJSONString(yearDto));
         JSONObject yearjson = JSON.parseObject(yearstr);
-        System.out.println("yearstr:" + yearjson);
+//        System.out.println("yearstr:" + yearjson);
         if (yearjson != null && yearjson.getInteger("code") == HttpStatus.SC_OK) {
             List<WarningData> data = yearjson.getJSONArray("data").toJavaList(WarningData.class);
 ////            return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType));