Merge remote-tracking branch 'origin/develop' into develop

数据判断验证
1 changed files with 1 additions and 1 deletions
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
@ -1957,7 +1957,7 @@ private VideoController videoController;
    public TableDataInfo dcDoorOpen(){
        startPage();
        Map<String, Object> redisCacheCacheMap = redisCache.getCacheMap(DOORSTATUS);
-        if (redisCacheCacheMap==null){
+        if (redisCacheCacheMap==null||redisCacheCacheMap.size()==0){
            return getDataTable(Collections.emptyList());
        }
        Set<String> strings = redisCacheCacheMap.keySet();
Author	SHA1	Message	Date
wangsixiang	05dce24c60	Merge remote-tracking branch 'origin/develop' into develop	3 weeks ago
wangsixiang	6763906af9	数据判断验证	3 weeks ago