1

src/main/java/com/fdkankan/agent/controller/SceneController.java

@@ -10,6 +10,7 @@ import com.fdkankan.agent.entity.CameraDetail;
 import com.fdkankan.agent.exception.BusinessException;
 import com.fdkankan.agent.httpClient.service.FdMangeService;
 import com.fdkankan.agent.request.SceneParam;
+import com.fdkankan.agent.response.AgentNewVo;
 import com.fdkankan.agent.service.ICameraDetailService;
 import com.fdkankan.agent.service.ICameraService;
 import com.fdkankan.agent.service.ISceneProService;
@@ -62,7 +63,12 @@ public class SceneController extends BaseController {
         if(cameraDetail == null){
             throw new BusinessException(ResultCode.CAMERA_SN_ERROR);
         }
-        if(cameraDetail.getAgentId() == null || !cameraDetail.getAgentId().equals(getAgent().getId())){
+        AgentNewVo agent = getAgent();
+        Integer agentId = agent.getId();
+        if(agent.getParentId() != null){
+            agentId = agent.getParentId();
+        }
+        if(cameraDetail.getAgentId() == null || !cameraDetail.getAgentId().equals(agentId)){
             throw new BusinessException(ResultCode.CAMERA_SN_ERROR);
         }
         return fdMangeService.move(param.getNum(), param.getSnCode());