diff --git a/src/middleware/auth.middleware.ts b/src/middleware/auth.middleware.ts index 12675e0..20435e0 100644 --- a/src/middleware/auth.middleware.ts +++ b/src/middleware/auth.middleware.ts @@ -58,12 +58,12 @@ export class AuthMiddleware implements IMiddleware { } // 3. 校验设备是否在白名单 - const isWhite = await this.deviceWhitelistService.isWhitelisted( - deviceId - ); - if (!isWhite) { - throw new httpError.UnauthorizedError('Device not authorized'); - } + // const isWhite = await this.deviceWhitelistService.isWhitelisted( + // deviceId + // ); + // if (!isWhite) { + // throw new httpError.UnauthorizedError('Device not authorized'); + // } } catch (error) { throw new httpError.UnauthorizedError('Invalid or expired token'); } diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts index 2defebc..0252f7b 100644 --- a/src/service/logistics.service.ts +++ b/src/service/logistics.service.ts @@ -656,7 +656,7 @@ export class LogisticsService { } const sql = ` - SELECT s.*, sp.name, o.externalOrderId + SELECT s.*, sp.name, o.externalOrderId, o.siteId FROM shipment s LEFT JOIN \`order\` o ON s.order_id = o.id LEFT JOIN stock_point sp ON s.stock_point_id = sp.id