From 1c4ed98abdba193ac105e6de5bcbab985b52edef Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 20 七月 2024 14:45:31 +0800
Subject: [PATCH] 三一车辆查询加入权限提交

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 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 31f5842..f3d9d50 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
@@ -572,7 +572,15 @@
                 }
                 for (Map<String, Object> m : carList) {
                     if (((String) m.get("stateCn")).contains("鍦ㄧ嚎")) {
-                        online = online + 1;
+                        String carId = (String) m.get("carId");
+                        ArdSyCar ardSyCarQuery = new ArdSyCar();
+                        ardSyCarQuery.setCarId(carId);
+                        List<ArdSyCar> ardSyCarList = ardSyCarMapper.selectArdSyCarList(ardSyCarQuery);
+                        if(ardSyCarList.size() != 0){
+                            online = online + 1;
+                        }else{
+                            continue;
+                        }
                     } else {
                         continue;
                     }
@@ -693,29 +701,19 @@
         //瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌list涓�
         for (int i = 0; i < list.size(); i++) {
             String carId = list.get(i).get("carId");
-            Boolean isCar = false;
             for (int j = 0; j < carList.size(); j++) {
                 ArdSyCar ardSyCar = carList.get(j);
                 if (carId.equals(ardSyCar.getCarId())) {
-                    /*String url = "";
-                    if (ardSyCar.getCarPicture() != null) {
-                        if (!ardSyCar.getCarPicture().equals("")) {
-                            url = ardSyCar.getCarPicture().split("sycar")[0];
-                        }
-                    }*/
                     list.get(i).put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
-                    //m.put("carModel",ardSyCar.getCarModel());
                     list.get(i).put("carTypeArd", ardSyCar.getCarType());
                     list.get(i).put("carBrand", ardSyCar.getCarBrand());
                     list.get(i).put("carPicture", ardSyCar.getCarPicture());
-                    isCar = true;
+                    list.get(i).put("deptId", ardSyCar.getDeptId());
                     break;
                 }
             }
-            /*if(!isCar){
-                list.remove(list.get(i));
-            }*/
         }
+        list = list.stream().filter(map -> map.get("deptId") != null).collect(Collectors.toList());
         return list;
     }
 

--
Gitblit v1.9.3