|
|
@@ -476,7 +476,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
|
|
|
if (StrUtil.isNotEmpty(deviceSearch)) {
|
|
|
queryWrapper.and(wrapper -> wrapper.likeRight(LambdaUtils.getUnderlineCaseName(DeviceInfo::getDeviceName), deviceSearch).or()
|
|
|
- .eq(LambdaUtils.getUnderlineCaseName(DeviceInfo::getMercDeviceCode), deviceSearch));
|
|
|
+ .eq(LambdaUtils.getUnderlineCaseName(DeviceInfo::getDeviceId), deviceSearch));
|
|
|
}
|
|
|
|
|
|
if (CollUtil.isNotEmpty(columnList)) {
|
