diff --git a/src/device/device.module.ts b/src/device/device.module.ts index a9fcdc4..ba9b019 100644 --- a/src/device/device.module.ts +++ b/src/device/device.module.ts @@ -5,15 +5,13 @@ import { ConfigModule } from '@nestjs/config'; import { ProductRepositoryModule } from '@app/common/modules/product/product.repository.module'; import { ProductRepository } from '@app/common/modules/product/repositories'; import { DeviceRepositoryModule } from '@app/common/modules/device'; -import { - DeviceRepository, - DeviceUserTypeRepository, -} from '@app/common/modules/device/repositories'; +import { DeviceRepository } from '@app/common/modules/device/repositories'; import { PermissionTypeRepository } from '@app/common/modules/permission/repositories'; import { SpaceRepository } from '@app/common/modules/space/repositories'; import { GroupDeviceRepository } from '@app/common/modules/group-device/repositories'; import { GroupRepository } from '@app/common/modules/group/repositories'; import { GroupRepositoryModule } from '@app/common/modules/group/group.repository.module'; +import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories'; @Module({ imports: [ ConfigModule, @@ -25,7 +23,7 @@ import { GroupRepositoryModule } from '@app/common/modules/group/group.repositor providers: [ DeviceService, ProductRepository, - DeviceUserTypeRepository, + DeviceUserPermissionRepository, PermissionTypeRepository, SpaceRepository, DeviceRepository, diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts index 112deb5..ed61330 100644 --- a/src/device/services/device.service.ts +++ b/src/device/services/device.service.ts @@ -215,6 +215,7 @@ export class DeviceService { where: { uuid: deviceUuid, }, + relations: ['productDevice', 'permission'], }); if (!deviceDetails) { @@ -224,6 +225,7 @@ export class DeviceService { const response = await this.getDeviceDetailsByDeviceIdTuya( deviceDetails.deviceTuyaUuid, ); + console.log('response', deviceDetails); return { ...response,