|
|
@@ -104,7 +104,7 @@ public class CheckPermitAspect {
|
|
|
}
|
|
|
|
|
|
//判断是否有公司管理者权限,有则放开
|
|
|
- if(roleIdSet.contains(6L)){
|
|
|
+// if(roleIdSet.contains(6L)){
|
|
|
//当前登录用户user
|
|
|
User currentUser = userService.getById(user.getId());
|
|
|
CameraDetail cameraDetail = cameraDetailService.findByCameraId(scenePlus.getCameraId());
|
|
|
@@ -112,15 +112,13 @@ public class CheckPermitAspect {
|
|
|
|| Objects.isNull(cameraDetail) || Objects.isNull(cameraDetail.getCompanyId())
|
|
|
|| !currentUser.getCompanyId().equals(cameraDetail.getCompanyId())){
|
|
|
throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
|
|
|
- }else{
|
|
|
- return;
|
|
|
}
|
|
|
- }
|
|
|
+// }
|
|
|
|
|
|
//校验场景用户是否与当前登录用户相同,相同则跳出
|
|
|
- if(Objects.isNull(scenePlus.getUserId()) || !scenePlus.getUserId().equals(user.getId())){
|
|
|
- throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
|
|
|
- }
|
|
|
+// if(Objects.isNull(scenePlus.getUserId()) || !scenePlus.getUserId().equals(user.getId())){
|
|
|
+// throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
|
|
|
+// }
|
|
|
|
|
|
}
|
|
|
|