diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java index 9b536ed7..0f41a466 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java @@ -55,7 +55,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls"); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); @@ -71,7 +71,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp"); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); @@ -87,7 +87,7 @@ public class PlatformvideomanagementController extends BaseController { Map map = new HashMap(); PageData pd =this.getPageData(); map = HKUtil.cameraSearch(pd); - if(!ObjectUtils.isEmpty(map)){ + if(ObjectUtils.isEmpty(map)){ map = new HashMap(); } map.put("result", "success"); diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index e26e7379..0bf78803 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -156,6 +156,7 @@ and ( + f.GATE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and ( + f.AREA_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and ( + r.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')