From 798e9d217439543b61cb095131f9bed1c0264dc6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 14 十月 2022 17:32:53 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
index 70b7589..a0c2e83 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java
@@ -26,7 +26,7 @@
     /**
      * 姘磋川鏁版嵁鏌ヨ
      *
-     * @return
+     * @returnlistWaterQualityData
      */
     @GetMapping("/listWaterQualityData")
     public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
@@ -43,7 +43,11 @@
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         WaterQualityDataDto waterQualityDataDto = waterQualityDataService.getWaterQualityDataInfo(waterQualityEquipmentCode);
-        return ResponseUtil.success(waterQualityDataDto);
+        if(waterQualityDataDto != null){
+            return ResponseUtil.success(waterQualityDataDto);
+        }else{
+            return ResponseUtil.fail("姘磋川璁惧鍙蜂笉姝g‘鎴栨按璐ㄦ暟鎹В鏋愬嚭閿�");
+        }
     }
 
 }

--
Gitblit v1.9.3