From b61c4537a78d58412ef7ccd6e2c30152d807c5b7 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 七月 2024 11:04:54 +0800
Subject: [PATCH] 电磁锁密码查询去除上一组密码修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index f3d9d50..e50c863 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -547,9 +547,13 @@
map.put("list", new ArrayList());
return map;
}
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.in("dept_id", deptList);
- List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);*/
+ List<ArdSyCar> carListTable = new ArrayList();
+ if(!deptList.isEmpty()){
+ carListTable = ardSyCarMapper.getCarListByDeptIdList(deptList);
+ }
int online = 0;
for (Map<String, Object> map : (List<Map<String, Object>>) result0.get("list")) {
Map<String, Object> resultMap = sYClient.getTeamCarList(syURL, (String) map.get("teamId"), result.get("sessionId"));
@@ -695,9 +699,14 @@
*/
@Override
public List<Map<String, String>> carIdByDeptList(List<Long> deptList, List<Map<String, String>> list) {
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.in("dept_id", deptList);
- List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);*/
+ List<ArdSyCar> carList = new ArrayList();
+ if(!deptList.isEmpty()){
+ carList = ardSyCarMapper.getCarListByDeptIdList(deptList);
+ }
+
//瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌list涓�
for (int i = 0; i < list.size(); i++) {
String carId = list.get(i).get("carId");
--
Gitblit v1.9.3