质检增加商户信息

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

@@ -95,9 +95,11 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
                 vo.setDeviceQualityValue(copy(DeviceQualityValueDto.Vo.class, deviceQualityValue));
                 //机器ID号商户信息
                 DeviceCreateIds deviceCreateIdsInfo = deviceCreateIdsJMaps.get(vo.getDeviceId());
-                MercDto.Vo merc = mercsJMaps.get(deviceCreateIdsInfo.getDeviceQrMercId());
-                if (Emptys.check(merc)) {
-                    vo.setDeviceQrMercId(merc.getId()).setDeviceQrMercName(merc.getName());
+                if (Emptys.check(deviceCreateIdsInfo)) {
+                    MercDto.Vo merc = mercsJMaps.get(deviceCreateIdsInfo.getDeviceQrMercId());
+                    if (Emptys.check(merc)) {
+                        vo.setDeviceQrMercId(merc.getId()).setDeviceQrMercName(merc.getName());
+                    }
                 }
             });
         }

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

@@ -152,9 +152,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                 }
                 //机器ID号商户信息
                 DeviceCreateIds deviceCreateIdsInfo = deviceCreateIdsJMaps.get(deviceRegister.getDeviceId());
-                MercDto.Vo merc = mercsJMaps.get(deviceCreateIdsInfo.getDeviceQrMercId());
-                if (Emptys.check(merc)) {
-                    deviceRegister.setDeviceQrMercId(merc.getId()).setDeviceQrMercName(merc.getName());
+                if (Emptys.check(deviceCreateIdsInfo)) {
+                    MercDto.Vo merc = mercsJMaps.get(deviceCreateIdsInfo.getDeviceQrMercId());
+                    if (Emptys.check(merc)) {
+                        deviceRegister.setDeviceQrMercId(merc.getId()).setDeviceQrMercName(merc.getName());
+                    }
                 }
             }
         }