1

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

@@ -2,6 +2,7 @@ package com.fdkankan.agent.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.agent.common.ResultCode;
+import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.entity.AgentNewCamera;
 import com.fdkankan.agent.entity.Camera;
 import com.fdkankan.agent.entity.CameraDetail;
@@ -54,7 +55,7 @@ public class AgentNewCameraServiceImpl extends ServiceImpl<IAgentNewCameraMapper
         giveCamera(param.getId(),param.getAgentId(),param.getSubAgentId());
     }
     public void giveCamera(Long cameraId,Integer agentId,Integer subAgentId) {
-        AgentNewCamera agentNewCamera = this.getByCameraId(cameraId);
+        AgentNewCamera agentNewCamera = this.getByCameraId(cameraId,agentId);
         if(agentNewCamera == null){
             agentNewCamera = new AgentNewCamera();
         }
@@ -67,7 +68,7 @@ public class AgentNewCameraServiceImpl extends ServiceImpl<IAgentNewCameraMapper
 
     @Override
     public void unBindCamera(CameraParam param) {
-        AgentNewCamera agentNewCamera = this.getByCameraId(param.getId());
+        AgentNewCamera agentNewCamera = this.getByCameraId(param.getId(),param.getAgentId());
         if(agentNewCamera != null){
             this.removeById(agentNewCamera.getId());
         }
@@ -87,9 +88,10 @@ public class AgentNewCameraServiceImpl extends ServiceImpl<IAgentNewCameraMapper
         return successNum;
     }
 
-    private AgentNewCamera getByCameraId(Long cameraId) {
+    private AgentNewCamera getByCameraId(Long cameraId, Integer agentId) {
         LambdaQueryWrapper<AgentNewCamera> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(AgentNewCamera::getCameraId,cameraId);
+        wrapper.eq(AgentNewCamera::getAgentId,agentId);
         return this.getOne(wrapper);
     }