设备增加搜索 名称或id

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

@@ -12,6 +12,7 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -707,6 +708,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         if (deviceId != null && myDeviceIds.contains(deviceId)) {
             deviceIdList.add(deviceId);
         }
+
         if (CollUtil.isNotEmpty(myDeviceIds) && deviceId == null) {
             deviceIdList.addAll(myDeviceIds);
         }
@@ -726,7 +728,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             List<Long> queryDeviceIds = new ArrayList<>();
             if (CollUtil.isNotEmpty(searchDeviceIds)) {
                 searchDeviceIds.forEach(id -> {
-                    if (deviceIdList.contains(id)) {
+                    int index = deviceIdList.indexOf(id);
+                    if (index > 0) {
                         queryDeviceIds.add(id);
                     }
                 });
@@ -741,6 +744,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         } else {
             return R.ok(new ArrayList<>());
         }
+        System.out.println("deviceIdList---------" + JSONUtil.toJsonPrettyStr(deviceIdList));
 
 
         List<DeviceInfoDto.MercHomeCountVO> list = this.baseMapper.merHomeCountList(dto);