From 3dbcce216ddcccb20745f47509ccb51f97c20a60 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 28 Jun 2024 21:56:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E8=BE=B9=E7=95=8C?=
 =?UTF-8?q?=E5=85=A5=E4=BE=B5=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=B8=8E=E7=9B=91?=
 =?UTF-8?q?=E7=AE=A1=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=9C=AA=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/controller/map/MapController.java  |  1 +
 .../map/MapPlatFormElectronicController.java           | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index 645365d4..4bfea969 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -941,6 +941,7 @@ public class MapController extends BaseController {
             alarmGet.getPage().setCurrent("1");
             alarmGet.getPage().setSize("5");
             alarmGet.setCorpId(pd.getString("corpId"));
+            alarmGet.setSourceNum(pd.getString("source"));
             map.put("result", "success");
             map.put("alarmList", dwService.getAlarmList(alarmGet));
             TraceGet get = new TraceGet();
diff --git a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
index be50910a..da0cdd79 100644
--- a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
+++ b/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
@@ -71,12 +71,14 @@ public class MapPlatFormElectronicController extends BaseController {
         String errInfo = "success";
         PageData pd = this.getPageData();
         if ("bianjieruqin".equals(pd.getString("TYPE"))){
-            if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){
-                pd.put("CORPINFO_ID",pd.get("corpId"));
-            }
+            // 注意：这里不加企业id
+//            if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){
+//                pd.put("CORPINFO_ID",pd.get("corpId"));
+//            }
+            pd.put("forMap","1");
             //列出Platformvideomanagement列表
             PageData condition = new PageData();
-            List<PageData>	varList = platformvideomanagementService.listAll(pd);
+            List<PageData>	varList = platformelectronicService.listAll(pd);
             for (PageData data : varList) {
                 data.put("MAP_POINT_NAME", data.getString("NAME"));
                 condition.clear();