质检商户扩展

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

@@ -614,8 +614,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         DeviceStatusDto.Vo deviceStatus = deviceInfo.getDeviceStatus();
         SysDictRedis qualitySets = SysDictUtils.get(EnumQualityMercSets.Code.CODE.getCode(), EnumQualityMercSets.MERC_CODE.getCode());
+        List<String> qualitySetList = Arrays.asList(qualitySets.getValue().split(","));
         // 设备当前商户是质检时不检查
-        if (!qualitySets.getValue().equals(deviceInfo.getMercCode())) {
+        if (!qualitySetList.contains(deviceInfo.getMercCode())) {
             check(deviceInfo.getActiveState(), 2, "设备未激活");
             check(deviceInfo.getFreezeStatus(), 2, "设备已冻结");
             check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getLockStateR() : deviceStatus.getLockStateL(), 2, "设备已锁机");