1

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

@@ -77,9 +77,14 @@ public class AgentNewCameraServiceImpl extends ServiceImpl<IAgentNewCameraMapper
 
     @Override
     public  List<AgentNewCamera> giveCamLog(Integer agentId,Integer cameraId) {
+        List<AgentNew> bySubAgent = agentNewService.getBySubAgent(agentId);
+        List<Integer> collect = bySubAgent.stream().map(AgentNew::getId).collect(Collectors.toList());
+        collect.add(agentId);
+
         LambdaQueryWrapper<AgentNewCamera> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AgentNewCamera::getAgentId,agentId);
+        wrapper.in(AgentNewCamera::getAgentId,collect);
         wrapper.eq(AgentNewCamera::getCameraId,cameraId);
+        wrapper.orderByAsc(AgentNewCamera::getId);
         List<AgentNewCamera> list = this.list(wrapper);
         List<Integer> subAgentIds = list.stream().map(AgentNewCamera::getSubAgentId).collect(Collectors.toList());
         HashMap<Integer, AgentNew> mapByIds = agentNewService.getMapByIds(subAgentIds);