|
@@ -178,7 +178,7 @@ 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));
|
|
|
+ List<DeviceInfo> deviceInfos = deviceInfoService.list(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getMercId, mercId).eq(DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode()));
|
|
|
if (CollUtil.isEmpty(deviceInfos)) {
|
|
|
return CollUtil.newArrayList();
|
|
|
}
|