设备二维码添加自定义商户

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

@@ -216,7 +216,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
         DeviceCreateIds deviceCreateIds = getById(qrcode.getDeviceId());
         //查询商户特有二维码地址
         String qrUrl = SysDictUtils.getValue(EnumDeviceQrCode.Code.CODE.getCode(), EnumDeviceQrCode.URL.getCode(), String.class);
-        if (Emptys.check(deviceCreateIds.getDeviceQrMercId())) {
+        if (Emptys.check(deviceCreateIds.getDeviceQrMercId()) && deviceCreateIds.getDeviceQrMercId() > 0) {
             MercDeviceQrConfigDto.Vo mercDeviceQrConfig = mercDeviceQrConfigService.obj(new MercDeviceQrConfigDto.Vo().setMercId(deviceCreateIds.getDeviceQrMercId())).getData();
             if (Emptys.check(mercDeviceQrConfig)) {
                 qrUrl = mercDeviceQrConfig.getQrUrl() + "?deviceId=";
@@ -253,7 +253,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
         JList<DeviceCreateIds> deviceCreateIdss = new JArrayList<>(listByIds(exportQrCode.getDeviceIds()));
         //查询商户特有二维码地址
         JMap<Long, MercDeviceQrConfigDto.Vo> mercDeviceQrConfigsJMas;
-        JList<Long> mercIds = deviceCreateIdss.filter().isNotNull(DeviceCreateIds::getDeviceQrMercId).list().getProperty(DeviceCreateIds::getDeviceQrMercId);
+        JList<Long> mercIds = deviceCreateIdss.filter().isNotNull(DeviceCreateIds::getDeviceQrMercId).gt(DeviceCreateIds::getDeviceQrMercId, 0).list().getProperty(DeviceCreateIds::getDeviceQrMercId);
         if (Emptys.check(mercIds)) {
             List<MercDeviceQrConfigDto.Vo> mercDeviceQrConfigs = mercDeviceQrConfigService.list(new MercDeviceQrConfigDto.SelectList().setMercId(mercIds)).getData();
             mercDeviceQrConfigsJMas = new JArrayList<>(mercDeviceQrConfigs).toMap(MercDeviceQrConfigDto.Vo::getMercId).cover();