1

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -51,6 +51,7 @@ public class FdUserCameraController extends BaseController {
         }
         String snCode = param.getString("snCode");
         String userName = param.getString("userName");
+        String platform = param.getString("platform");
         if(StringUtils.isEmpty(userName)){
             userName = JwtUtil.getUsername(getToken());
         }
@@ -62,7 +63,10 @@ public class FdUserCameraController extends BaseController {
         if(ObjectUtils.isEmpty(cameraDetailEntity)){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
         }
-        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId()) || cameraDetailEntity.getCompanyId() != 25L) {
+        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId()) ) {
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
+        }
+        if(!StringUtils.isEmpty(platform) && "fusion".equals(platform) && cameraDetailEntity.getCompanyId().equals(25L)){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
         }