From 7ae632cdf459e9860a01b6520e10afb57c0761b3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:01:37 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 62cc0a3..b1c60e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -282,11 +282,12 @@
         if(carmeraListVOList!=null && carmeraListVOList.size()>0){
             for(PageRegionInfoResponse p : allList){
                 for(CarmeraListVO c : carmeraListVOList){
-                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode()) ){
+                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
                         if(p.getCarmeraList()==null){
-                            p.setDeviceList(new ArrayList<>());
+                            p.setCarmeraList(new ArrayList<>());
                         }
-                        p.getDeviceList().add(c);
+                        p.getCarmeraList().add(c);
                     }
                 }
             }
@@ -298,11 +299,12 @@
         if(carmeraListVOList!=null && carmeraListVOList.size()>0){
             for(PageRegionInfoResponse p : allList){
                 for(CarmeraListVO c : carmeraListVOList){
-                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())){
-                        if(p.getSensorList()==null){
-                            p.setSensorList(new ArrayList<>());
+                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
+                        if(p.getCarmeraList()==null){
+                            p.setCarmeraList(new ArrayList<>());
                         }
-                        p.getSensorList().add(c);
+                        p.getCarmeraList().add(c);
                     }
                 }
             }

--
Gitblit v1.9.3