From 4f02e6b2ce3645aaedb77115503b7e19e869c3b9 Mon Sep 17 00:00:00 2001 From: kissnavel Date: Sun, 1 Sep 2024 04:11:03 +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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index 6217b98..a5be028 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 = _.get(deviceCfg, 'productName') || _.get(defDeviceCfg, 'productName'), - deviceType = _.get(deviceCfg, 'productType') || _.get(defDeviceCfg, 'productType'), - modelName = _.get(deviceCfg, 'modelName') || _.get(defDeviceCfg, 'modelName'), - oaid = _.get(deviceCfg, 'oaid') || _.get(defDeviceCfg, 'oaid'), - deviceInfo = _.get(deviceCfg, 'deviceInfo') || _.get(defDeviceCfg, 'deviceInfo'), - board = _.get(deviceCfg, 'board') || _.get(defDeviceCfg, 'board'), + 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'), + oaid = deviceCfg.oaid ? _.get(deviceCfg, 'oaid') : _.get(defDeviceCfg, 'oaid'), + deviceInfo = deviceCfg.deviceInfo ? _.get(deviceCfg, 'deviceInfo') : _.get(defDeviceCfg, 'deviceInfo'), + board = deviceCfg.board ? _.get(deviceCfg, 'board') : _.get(defDeviceCfg, 'board'), } = data; const deviceBrand = deviceInfo.split('/')[0]; let urlMap = {