|
@@ -685,7 +685,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
List<DeviceInfo> list = list(Wrappers.<DeviceInfo>lambdaQuery()
|
|
|
.eq(DeviceInfo::getMercId, mercId)
|
|
|
.and(wrapper -> wrapper
|
|
|
- .eq(DeviceInfo::getDeviceId, deviceId)
|
|
|
+ .eq(DeviceInfo::getDeviceId, searchKey)
|
|
|
.or()
|
|
|
.likeRight(DeviceInfo::getDeviceName, searchKey)
|
|
|
)
|