设备查询-权限

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

@@ -717,7 +717,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         LambdaQueryWrapper<DeviceInfo> lqw = new LambdaQueryWrapper<>();
         //非质检商户才需要激活
         lqw.eq(!isQa, DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode());
-        lqw.eq(mercId != null && CollUtil.isEmpty(myDeviceIds), DeviceInfo::getMercId, mercId);
+        lqw.eq(mercId != null, DeviceInfo::getMercId, mercId);
         lqw.eq(busyStatus != null, DeviceInfo::getBusyState, busyStatus);
         lqw.eq(deviceType != null, DeviceInfo::getDeviceType, deviceType);
         lqw.in(CollUtil.isNotEmpty(deviceIdList), DeviceInfo::getDeviceId, deviceIdList);