|
@@ -67,11 +67,11 @@ public class MercPcDeviceController {
|
|
|
page.setMercId(page.getMercId() == null ? MercAuthUtils.getMercId() : page.getMercId());
|
|
|
//非商户管理员,按设备权限过滤
|
|
|
if (!MercAuthUtils.isMercAdmin()) {
|
|
|
- List<Long> mercDeviceIds = getMercDeviceIds();
|
|
|
+ List<Long> mercDeviceIds = getMercDeviceIds(true);
|
|
|
if (CollUtil.isEmpty(mercDeviceIds)) {
|
|
|
return R.ok(new PageBean<>());
|
|
|
}
|
|
|
- page.setMyDeviceIds(mercDeviceIds);
|
|
|
+ page.setDeviceIdList(mercDeviceIds);
|
|
|
|
|
|
}
|
|
|
PageBean<DeviceInfoDto.Vo2> vo2PageBean = deviceService.queryPage(page);
|
|
@@ -83,14 +83,14 @@ public class MercPcDeviceController {
|
|
|
public R<DeviceInfoDto.PageCount> pageCount(@RequestBody DeviceInfoDto.Page page) {
|
|
|
page.setMercId(page.getMercId() == null ? MercAuthUtils.getMercId() : page.getMercId());
|
|
|
//非商户管理员,按设备权限过滤
|
|
|
- if (!MercAuthUtils.isMercAdmin()) {
|
|
|
- List<Long> mercDeviceIds = getMercDeviceIds();
|
|
|
- if (CollUtil.isEmpty(mercDeviceIds)) {
|
|
|
- return R.ok(new DeviceInfoDto.PageCount ());
|
|
|
- }
|
|
|
- page.setMyDeviceIds(mercDeviceIds);
|
|
|
+
|
|
|
+ List<Long> mercDeviceIds = getMercDeviceIds(true);
|
|
|
+ if (CollUtil.isEmpty(mercDeviceIds)) {
|
|
|
+ return R.ok(new DeviceInfoDto.PageCount ());
|
|
|
}
|
|
|
- return R.ok(deviceService.pageCountForPc(page));
|
|
|
+ page.setMyDeviceIds(mercDeviceIds);
|
|
|
+
|
|
|
+ return R.ok(deviceService.pageCountForPc(page));
|
|
|
}
|
|
|
|
|
|
|
|
@@ -99,12 +99,13 @@ public class MercPcDeviceController {
|
|
|
*
|
|
|
* @return {@link List}<{@link Long}>
|
|
|
*/
|
|
|
- public List<Long> getMercDeviceIds() {
|
|
|
+ public List<Long> getMercDeviceIds(Boolean showNoActive) {
|
|
|
MercDto.MercDevicesDTO mercDevicesDTO = new MercDto.MercDevicesDTO();
|
|
|
mercDevicesDTO.setMercAdmin(MercAuthUtils.isMercAdmin());
|
|
|
mercDevicesDTO.setMercId(MercAuthUtils.getMercId());
|
|
|
Long userId = MercAuthUtils.getMercAuth().getUserInfo().getUserId();
|
|
|
mercDevicesDTO.setUserId(userId);
|
|
|
+ mercDevicesDTO.setShowNoActive(showNoActive);
|
|
|
List<Long> deviceIds = R.feignCheckData(mercService.getMercDevices(mercDevicesDTO));
|
|
|
return deviceIds;
|
|
|
}
|