From 4c7e2078a1439ad6fb42f8854f5f8ac1e6859cbc Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 18 十二月 2023 15:19:58 +0800
Subject: [PATCH] fly

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index c27a0a6..4bb43b6 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -194,13 +194,21 @@
 
     @Override
     public List<CarVo> queryCar(List<String> list) {
-        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+//        if(list.size()>0){
+//            queryWrapper.ne("reserved_1","").notIn("car_id",list);
+//        }else {
+//            queryWrapper.ne("reserved_1","");
+//        }
+//        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
+        List<ArdSyCar> ardSyCars = new ArrayList<>();
         if(list.size()>0){
-            queryWrapper.ne("reserved_1","").notIn("car_id",list);
+            QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+            queryWrapper.notIn("car_id",list);
+            ardSyCars = ardSyCarMapper.selectList(queryWrapper);
         }else {
-            queryWrapper.ne("reserved_1","");
+            ardSyCars = ardSyCarMapper.selectList(null);
         }
-        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
         return carAnalysis(ardSyCars);
     }
 

--
Gitblit v1.9.3