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 varList = platformvideomanagementService.listAll(pd); + List varList = platformelectronicService.listAll(pd); for (PageData data : varList) { data.put("MAP_POINT_NAME", data.getString("NAME")); condition.clear();