From a5129868590851b763da6698ad6f2c6eb8097859 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Mon, 15 Jan 2024 16:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=8A=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/map/impl/MapKeyProjectServiceImpl.java | 13 ++----------- .../mybatis/datasource/map/MapKeyProjectMapper.xml | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java index 831910ce..2dd375c6 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java @@ -64,23 +64,14 @@ public class MapKeyProjectServiceImpl implements MapKetProjectService { Map returnMap = new HashMap<>(); String errInfo = "success"; //根据条件增加参数或减少参数 都没有 直接返回空 - if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { - List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); - if (ArrayDATA_IDS.size() == 0) { - returnMap.put("result", errInfo); - return returnMap; - } - ArrayDATA_IDS.add("1"); - pd.put("ids", ArrayDATA_IDS); - pd.remove("CORPINFO_ID"); - } + pd.getString("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); String typeStr = pd.getString("TYPE"); List r = new ArrayList<>(); //重点工程 if(StringUtils.equals(typeStr,"PROJECT")){ r = keyProjectMapper.getProjectLocation(pd); //视频 - }else if(StringUtils.equals(typeStr,"VIDEO")){ + }else if(StringUtils.equals(typeStr,"camera")){ r = keyProjectMapper.getVideoLocation(pd); } returnMap.put("varList", r); diff --git a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml index 8a72e8af..2107447c 100644 --- a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml +++ b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml @@ -79,7 +79,7 @@