|
@@ -114,8 +114,10 @@ public class AppCameraService {
|
|
|
List<Long> cameraIds = Collections.singletonList(camera.getId());
|
|
|
|
|
|
UserIncrement userIncrement = userIncrementService.getByCameraId(camera.getId());
|
|
|
- cameraIncrementLogService.saveLog(camera.getId(),userIncrement.getId(),user.getId(),1);
|
|
|
- cameraIncrementLogService.saveLog(camera.getId(),userIncrement.getId(),user.getId(),3);
|
|
|
+ if(userIncrement != null){
|
|
|
+ cameraIncrementLogService.saveLog(camera.getId(),userIncrement.getId(),user.getId(),1);
|
|
|
+ }
|
|
|
+ cameraIncrementLogService.saveLog(camera.getId(),null,user.getId(),3);
|
|
|
|
|
|
userIncrementService.unbindCamera(cameraIds); //取消关联用户权益
|
|
|
cameraDetailService.unbindCamera(cameraIds); //取消相机用户关联
|