1

src/main/java/com/fdkankan/agent/service/IAgentNewCameraService.java

@@ -21,7 +21,7 @@ public interface IAgentNewCameraService extends IService<AgentNewCamera> {
 
     List<Long> getBySubAgent(Integer subAgentId);
 
-    HashMap<Long, AgentNewCamera> getMapByCameraIds(List<Long> voCameraIds);
+    HashMap<Long, AgentNewCamera> getMapByCameraIds(List<Long> voCameraIds,Integer agentId);
 
     Integer giveCameraBatch(List<Long> cameraIds, Integer agentId, Integer subAgentId);
 

src/main/java/com/fdkankan/agent/service/impl/AgentNewCameraServiceImpl.java

@@ -104,13 +104,14 @@ public class AgentNewCameraServiceImpl extends ServiceImpl<IAgentNewCameraMapper
     }
 
     @Override
-    public HashMap<Long, AgentNewCamera> getMapByCameraIds(List<Long> voCameraIds) {
+    public HashMap<Long, AgentNewCamera> getMapByCameraIds(List<Long> voCameraIds,Integer agentId) {
         HashMap<Long, AgentNewCamera> map = new HashMap<>();
         if(voCameraIds.isEmpty()){
             return map;
         }
         LambdaQueryWrapper<AgentNewCamera> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(AgentNewCamera::getCameraId,voCameraIds);
+        wrapper.eq(AgentNewCamera::getAgentId,agentId);
         List<AgentNewCamera> list = this.list(wrapper);
         list.forEach(e -> map.put(e.getCameraId(),e));
         return map;

src/main/java/com/fdkankan/agent/service/impl/CameraServiceImpl.java

@@ -54,7 +54,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
         List<Long> voCameraIds = voPage.getRecords().stream().map(CameraDetailVo::getId).collect(Collectors.toList());
 
-        HashMap<Long, AgentNewCamera> map = agentNewCameraService.getMapByCameraIds(voCameraIds);
+        HashMap<Long, AgentNewCamera> map = agentNewCameraService.getMapByCameraIds(voCameraIds,param.getAgentId());
         List<Integer> subAgentIds = map.values().stream().map(AgentNewCamera::getSubAgentId).collect(Collectors.toList());
         HashMap<Integer,AgentNew> agentMap = agentNewService.getMapByIds(subAgentIds);