plus套餐设备选择-按商户分页查设备

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

@@ -128,6 +128,7 @@ public class MercMiniDeviceController {
             //查询已选择，为前端传入 deviceIds
             dto.setDeviceIds(deviceIds);
         }
+        dto.setMyDeviceIds(getMyDevices());
         return R.ok(deviceInfoService.pageByMerc(dto));
     }
 

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

@@ -431,6 +431,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             if (CollUtil.isNotEmpty(deviceIds)) {
                 lqw.notIn(DeviceInfo::getDeviceId, deviceIds);
             } else {
+                if (CollUtil.isNotEmpty(myDeviceIds)) {
+                    return new PageBean<>();
+                }
                 lqw.in(DeviceInfo::getDeviceId, myDeviceIds);
             }
         } else {