qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-03-14 08:53:20 +08:00
parent 0f43b64d0b
commit 95b8de13ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -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);
}