|
@@ -53,6 +53,8 @@ public class CheckCurrenUserAspect {
|
|
|
private IUserRoleService userRoleService;
|
|
|
@Autowired
|
|
|
private IUserService userService;
|
|
|
+ @Autowired
|
|
|
+ private ICameraDetailService cameraDetailService;
|
|
|
|
|
|
// Service层切点
|
|
|
@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckCurrentUser)")
|
|
@@ -108,10 +110,10 @@ public class CheckCurrenUserAspect {
|
|
|
if(roleIdSet.contains(6L)){
|
|
|
//当前登录用户user
|
|
|
User currentUser = userService.getById(user.getId());
|
|
|
- User sceneUser = userService.getById(scenePro.getUserId());
|
|
|
+ CameraDetail cameraDetail = cameraDetailService.findByCameraId(scenePro.getCameraId());
|
|
|
if(Objects.isNull(currentUser) || Objects.isNull(currentUser.getCompanyId())
|
|
|
- || Objects.isNull(sceneUser) || Objects.isNull(sceneUser.getCompanyId())
|
|
|
- || !currentUser.getCompanyId().equals(sceneUser.getCompanyId())){
|
|
|
+ || Objects.isNull(cameraDetail) || Objects.isNull(cameraDetail.getCompanyId())
|
|
|
+ || !currentUser.getCompanyId().equals(cameraDetail.getCompanyId())){
|
|
|
throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
|
|
|
}else{
|
|
|
return;
|