优化设备自定义二维码

device-api-service/src/main/java/com/xy/service/DeviceCreateIdsServiceImpl.java

@@ -221,7 +221,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
         String qrUrl = SysDictUtils.getValue(EnumDeviceQrCode.Code.CODE.getCode(), EnumDeviceQrCode.URL.getCode(), String.class);
         //查询商户特有二维码地址
         DeviceInfo deviceInfo = deviceInfoService.getById(qrcode.getDeviceId());
-        if (Emptys.check(deviceInfo.getMercId())) {
+        if (Emptys.check(deviceInfo) && Emptys.check(deviceInfo.getMercId())) {
             MercDeviceQrConfigDto.Vo mercDeviceQrConfig = mercDeviceQrConfigService.getQrUrl(new MercDeviceQrConfigDto.GetQrUrl().setMercId(deviceInfo.getMercId())).getData();
             if (Emptys.check(mercDeviceQrConfig)) {
                 qrUrl = mercDeviceQrConfig.getQrUrl() + "?deviceId=";
@@ -264,7 +264,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
             String qrUrl = url;
             //查询商户特有二维码地址
             DeviceInfo deviceInfo = deviceInfoJMaps.get(deviceCreateIds.getDeviceId());
-            if (Emptys.check(deviceInfo.getMercId())) {
+            if (Emptys.check(deviceInfo) && Emptys.check(deviceInfo.getMercId())) {
                 MercDeviceQrConfigDto.Vo mercDeviceQrConfig = mercDeviceQrConfigService.getQrUrl(new MercDeviceQrConfigDto.GetQrUrl().setMercId(deviceInfo.getMercId())).getData();
                 if (Emptys.check(mercDeviceQrConfig)) {
                     qrUrl = mercDeviceQrConfig.getQrUrl() + "?deviceId=";