From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
index 37d50d5..a6e4120 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -40,14 +40,14 @@
@GetMapping(value = "/list")
public R<IPage<ReportFloodRecordVO>> queryPageList(ReportFloodRecordVO reportFloodRecord, Query query) {
- String code = reportFloodRecord.getAdCode();
- if (StringUtil.isNoneBlank(code)){
- if (code.substring(0,4).indexOf("00") > -1) {
- reportFloodRecord.setAdCode(code.substring(0,2));
- } else if (code.substring(0,6).indexOf("00") > -1) {
- reportFloodRecord.setAdCode(code.substring(0,4));
- }
- }
+// String code = reportFloodRecord.getAdCode();
+// if (StringUtil.isNoneBlank(code)){
+// if (code.substring(0,4).indexOf("00") > -1) {
+// reportFloodRecord.setAdCode(code.substring(0,2));
+// } else if (code.substring(0,6).indexOf("00") > -1) {
+// reportFloodRecord.setAdCode(code.substring(0,4));
+// }
+// }
IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
return R.data(pageList);
}
@@ -109,7 +109,7 @@
@ApiOperation(value = "报汛记录-通过id查询", notes = "报汛记录-通过id查询")
@GetMapping(value = "/queryById")
public R queryById(@RequestParam(name = "id", required = true) String id) {
- ReportFloodRecord reportFloodRecord = reportFloodRecordService.getById(id);
+ ReportFloodRecordVO reportFloodRecord = reportFloodRecordService.getDetailVO(id);
return R.data(reportFloodRecord);
}
--
Gitblit v1.9.3