From 95b8de13ec8acdce1e14b0972d1ce0454628a6e6 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Fri, 14 Mar 2025 08:53:20 +0800
Subject: [PATCH] 111

---
 .../com/ruoyi/system/service/impl/AsDeviceServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<AsDeviceMapper, AsDevice> 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<AsDeviceMapper, AsDevice> 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);
         }