From 7f27bbf332230258bac263a262f43a3429b4a5d6 Mon Sep 17 00:00:00 2001 From: kissnavel Date: Thu, 19 Sep 2024 18:40:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mysapi/tool.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index 49e8858..7f152a7 100644 --- a/lib/mysapi/tool.js +++ b/lib/mysapi/tool.js @@ -79,12 +79,12 @@ export default class ZZZApiTool { const deviceCfg = settings.getConfig('device'); const defDeviceCfg = settings.getdefSet('device'); const { - productName = deviceCfg.productName ? _.get(deviceCfg, 'productName') : _.get(defDeviceCfg, 'productName'), - deviceType = deviceCfg.productType ? _.get(deviceCfg, 'productType') : _.get(defDeviceCfg, 'productType'), - modelName = deviceCfg.modelName ? _.get(deviceCfg, 'modelName') : _.get(defDeviceCfg, 'modelName'), + productName = _.get(deviceCfg, 'productName') ?? _.get(defDeviceCfg, 'productName'), + deviceType = _.get(deviceCfg, 'productType') ?? _.get(defDeviceCfg, 'productType'), + modelName = _.get(deviceCfg, 'modelName') ?? _.get(defDeviceCfg, 'modelName'), oaid = this.uuid, - deviceInfo = deviceCfg.deviceInfo ? _.get(deviceCfg, 'deviceInfo') : _.get(defDeviceCfg, 'deviceInfo'), - board = deviceCfg.board ? _.get(deviceCfg, 'board') : _.get(defDeviceCfg, 'board'), + deviceInfo = _.get(deviceCfg, 'deviceInfo') ?? _.get(defDeviceCfg, 'deviceInfo'), + board = _.get(deviceCfg, 'board') ?? _.get(defDeviceCfg, 'board'), } = data; const deviceBrand = deviceInfo.split('/')[0]; let urlMap = {