From c3c43488d9f1cfa125171a50be79a3ee4081a2c5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 19 五月 2022 17:47:46 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java | 11 +++++++++--
1 files changed, 9 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 a1317c0..4458695 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
@@ -29,7 +29,7 @@
* @return
*/
@GetMapping("/listWaterQualityData")
- public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.WATER_DATA_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -39,8 +39,15 @@
@PostMapping("/getWaterQualityDataInfo/{waterQualityEquipmentCode}")
public ResponseVO<Object> getWaterQualityDataInfo(@PathVariable String waterQualityEquipmentCode) {
+ if (!permissionConfig.check(MenuEnum.WATER_DATA_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
WaterQualityDataDto waterQualityDataDto = waterQualityDataService.getWaterQualityDataInfo(waterQualityEquipmentCode);
- return ResponseUtil.success(waterQualityDataDto);
+ if(waterQualityDataDto != null){
+ return ResponseUtil.success(waterQualityDataDto);
+ }else{
+ return ResponseUtil.fail("姘磋川璁惧鍙蜂笉姝ｇ‘鎴栨按璐ㄦ暟鎹В鏋愬嚭閿�");
+ }
}
}
--
Gitblit v1.9.3