lyhzzz 2 年之前
父节点
当前提交
1d68a03176
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/main/java/com/fdkankan/ucenter/controller/CameraController.java

+ 3 - 1
src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -292,7 +292,9 @@ public class CameraController extends BaseController {
                 String date = DateUserUtil.getLastZeroTime(param.getEndTime());
                 wrapper.le(ScenePro::getCreateTime,date);
             }
-            sceneEntityList = sceneProService.list(wrapper);
+            if(StringUtils.isNotBlank(param.getStartTime()) || StringUtils.isNotBlank(param.getEndTime())){
+                sceneEntityList = sceneProService.list(wrapper);
+            }
         }
 
         HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIdList);