1

src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -189,15 +189,7 @@ public class CameraController extends BaseController {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         if(cameraIdList.size() >0){
             wrapper.in(ScenePro::getCameraId,cameraIdList);
-            if(StringUtils.isNotBlank(param.getStartTime())){
-                wrapper.ge(ScenePro::getCreateTime,param.getStartTime());
-            }
-            if(StringUtils.isNotBlank(param.getEndTime())){
-                String date = DateUserUtil.getLastZeroTime(param.getEndTime());
-                wrapper.le(ScenePro::getCreateTime,date);
-            }
-            wrapper.orderByDesc(ScenePro::getCreateTime);
-           sceneEntityList = sceneProService.list(wrapper);
+            sceneEntityList = sceneProService.list(wrapper);
         }
 
         HashMap<Long,List<ScenePro>> sceneProMap = new HashMap<>();
@@ -292,6 +284,17 @@ public class CameraController extends BaseController {
 
         }
 
+        if(sceneEntityList.size() >0){
+            if(StringUtils.isNotBlank(param.getStartTime())){
+                wrapper.ge(ScenePro::getCreateTime,param.getStartTime());
+            }
+            if(StringUtils.isNotBlank(param.getEndTime())){
+                String date = DateUserUtil.getLastZeroTime(param.getEndTime());
+                wrapper.le(ScenePro::getCreateTime,date);
+            }
+            sceneEntityList = sceneProService.list(wrapper);
+        }
+
         HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIdList);
         HashMap<Long, Integer> cameraSnCodeCountMap = new HashMap<>();
         for (ScenePro sceneProEntity : sceneEntityList) {