1

src/main/java/com/fdkankan/agent/common/ResultCode.java

@@ -32,6 +32,7 @@ public enum ResultCode {
     UPLOAD_EXCEL_ERROR(4029, "批量导入失败"),
     AGENT_STOP_USE(4030, "当前账号已停用，请联系管理员"),
     AGENT_NOT_SUB(4031, "当前经销商无法新增下级"),
+    AUTH_ERROR(4032, "权限不足"),
 
     ;
 

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

@@ -39,6 +39,8 @@ public class AgentNewCameraServiceImpl extends ServiceImpl<IAgentNewCameraMapper
     ICameraService cameraService;
     @Autowired
     ICameraDetailService cameraDetailService;
+    @Autowired
+    IAgentNewCameraService agentNewCameraService;
     @Override
     public void giveCamera(CameraParam param) {
         Camera camera = cameraService.getById(param.getId());
@@ -46,12 +48,15 @@ public class AgentNewCameraServiceImpl extends ServiceImpl<IAgentNewCameraMapper
             throw new BusinessException(ResultCode.CAMERA_EMPTY);
         }
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
-        if(cameraDetail == null){
+        if(cameraDetail == null || cameraDetail.getAgentId() == null){
             throw new BusinessException(ResultCode.CAMERA_EMPTY);
         }
-//        if(!cameraDetail.getAgentId().equals(param.getAgentId())){
-//            throw new BusinessException(ResultCode.CAMERA_EMPTY);
-//        }
+        if(!cameraDetail.getAgentId().equals(param.getAgentId())){
+            List<AgentNewCamera> bySubAgent = agentNewCameraService.getBySubAgent(camera.getId(), param.getAgentId());
+            if(bySubAgent.isEmpty()){
+                throw new BusinessException(ResultCode.AUTH_ERROR);
+            }
+        }
         giveCamera(param.getId(),param.getAgentId(),param.getSubAgentId());
     }
     public void giveCamera(Long cameraId,Integer agentId,Integer subAgentId) {