From be17f47d43596999f46e0b202d485ccba496b687 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 09:23:00 +0800
Subject: [PATCH] 电磁锁与三一车辆耦合修改提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
index d26c725..86cc3c3 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -278,13 +278,13 @@
String userId = SecurityUtils.getUserId();
List<Map<String,String>> result = ardTankLockService.getLockByCarPlate(userId,para.get("carPlate"));
return getDataTable(result);*/
- PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
+ //PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
String userId = SecurityUtils.getUserId();
- List<Map<String,Object>> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"));
+ Map<String,Object> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"),(Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
TableDataInfo dataTable = new TableDataInfo();
- dataTable.setRows(result);
- dataTable.setTotal(result.size());
+ dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
dataTable.setCode(200);
dataTable.setMsg("鏌ヨ鎴愬姛");
return dataTable;
--
Gitblit v1.9.3