diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index d94884b..99b6f8f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -243,7 +243,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i } Long hardwareVersionId = asDevice.getHardwareVersionId(); - if (ObjectUtil.isNotNull(hardwareVersionId) && areaId!=0) { + if (ObjectUtil.isNotNull(hardwareVersionId) && ObjectUtil.isNotNull(areaId) && areaId!=0) { EtHardwareVersion etHardwareVersion = hardwareVersionService.selectEtHardwareVersionById(hardwareVersionId); asDevice.setHardwareVersion(etHardwareVersion.getVersion()); } @@ -335,7 +335,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i asDevice1.setQrText(sysDept.getDomain()+"?sn="+asDevice1.getSn()); asDevice1.setDeptName(sysDept.getDeptName()); }else{ - asDevice1.setQrText(""); + asDevice1.setQrText("https://dche.ccttiot.com?sn="+asDevice1.getSn()); } pullDeviceInfo(asDevice1); }