From 1e6dbe352c35a54c299008c523e38b1e59d1ea03 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 07 Jul 2023 14:01:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-api/src/main/java/com/moral/api/controller/UAVController.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java index 73c119e..29c41ef 100644 --- a/screen-api/src/main/java/com/moral/api/controller/UAVController.java +++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java @@ -51,6 +51,10 @@ @RequestMapping("queryDataByBatch") public ResultMessage queryDataByBatch(String batch){ List<HistorySecondUav> historySecondUavs = historySecondUavService.queryDataByBatch(batch); + if (historySecondUavs==null){ + return new ResultMessage(ResponseCodeEnum.SENSOR_IS_NOT_EXIST,"null"); + } + //������������������������ HistorySecondUavVOs vo = HistorySecondUavVOs.convert(historySecondUavs); return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo); -- Gitblit v1.8.0