lyhzzz пре 1 година
родитељ
комит
83ba133403

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -623,7 +623,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public HashMap<Long, Camera> getByIds(List<Long> cameraIds) {
         HashMap<Long, Camera> map = new HashMap<>();
-        if(cameraIds != null && cameraIds.size() >=0){
+        if(cameraIds != null && !cameraIds.isEmpty()){
             List<Camera> cameraList = this.listByIds(cameraIds);
             cameraList.forEach(entity -> map.put(entity.getId(),entity));
         }

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -271,7 +271,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
             }
             if(cameraMap != null){
-                Camera camera = cameraMap.get(record.getUserId());
+                Camera camera = cameraMap.get(record.getCameraId());
                 if(camera != null){
                     record.setSnCode(camera.getSnCode());
                 }