设备首页查询

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

@@ -690,7 +690,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         if (deviceId != null && myDeviceIds.contains(deviceId)) {
             deviceIdList.add(deviceId);
         }
-        if (CollUtil.isNotEmpty(myDeviceIds)) {
+        if (CollUtil.isNotEmpty(myDeviceIds) && deviceId == null) {
             deviceIdList.addAll(myDeviceIds);
         }
 
@@ -706,6 +706,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         }
         if (CollUtil.isNotEmpty(deviceIdList)) {
             dto.setDeviceIdList(deviceIdList);
+        } else {
+            return R.ok(new ArrayList<>());
         }