diff --git a/app/Services/ParkingPatternSpaceService.php b/app/Services/ParkingPatternSpaceService.php index f6db0a8..4cef9d1 100644 --- a/app/Services/ParkingPatternSpaceService.php +++ b/app/Services/ParkingPatternSpaceService.php @@ -165,18 +165,20 @@ class ParkingPatternSpaceService extends BaseService return []; } - // 车位删除同步删除已添加的绘制地图 - public static function syncDeleteMapSpace($space_id) + // 车位删除同步删除已添加模式车位 + public static function syncDelPatternSpace($space_id) { - $id = ParkingPatternSpace::query()->where([ + $ids = ParkingPatternSpace::query()->where([ 'space_id' => $space_id - ])->value('id'); - if ($id) { - $model = ParkingPatternSpace::query()->findOrFail($id); + ])->pluck('id'); + if ($ids) { + $model = ParkingPatternSpace::query()->whereIn('id', $ids); + $oldValue = $model->select()->get()->toArray(); $model->delete(); - (new OperationLogService())->logDeleted( - $model, - 'parking_pattern_space.delete' + (new OperationLogService())->logDeletedData( + new ParkingPatternSpace(), + 'parking_pattern_space.delete', + $oldValue ); } } diff --git a/app/Services/ParkingSpaceService.php b/app/Services/ParkingSpaceService.php index b8b7e9b..12e5171 100644 --- a/app/Services/ParkingSpaceService.php +++ b/app/Services/ParkingSpaceService.php @@ -557,7 +557,7 @@ class ParkingSpaceService extends BaseService ); // 同步删除模式关联车位 - ParkingPatternSpaceService::syncDeleteMapSpace($id); + ParkingPatternSpaceService::syncDelPatternSpace($id); DB::commit(); return true; @@ -591,7 +591,7 @@ class ParkingSpaceService extends BaseService $oldValue['floor_id'] ); // 同步删除模式关联车位 - ParkingPatternSpaceService::syncDeleteMapSpace($id); + ParkingPatternSpaceService::syncDelPatternSpace($id); } DB::commit();