qa设备查询调整

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -397,7 +397,10 @@ public class MercMiniDeviceController {
         boolean mercAdmin = MercAuthUtils.isMercAdmin();
         Long mercId = MercAuthUtils.getMercId();
         if (mercAdmin) {
-            List<DeviceInfo> deviceInfos = deviceInfoService.list(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getMercId, mercId).eq(DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode()));
+            MercAuthUtils.MercAuth.Merc merc = MercAuthUtils.getMercAuth().getMerc();
+            boolean qaModeMerc = MercAuthUtils.isQaModeMerc(merc.getMercCode());
+            //非QA需要查激活的设备
+            List<DeviceInfo> deviceInfos = deviceInfoService.list(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getMercId, mercId).eq(!qaModeMerc, DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode()));
             if (CollUtil.isEmpty(deviceInfos)) {
                 return CollUtil.newArrayList();
             }