|
|
@@ -351,6 +351,12 @@ public class EquipmentBaseServiceImpl extends ServiceImpl<EquipmentBaseMapper, E
|
|
|
}
|
|
|
LambdaQueryWrapper<EquipmentBase> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.in(CollUtil.isNotEmpty(equipmentIds), EquipmentBase::getEquipmentId, equipmentIds)
|
|
|
+ .and(StringUtils.isNotBlank(listInDTO.getKeyword()), wrapper -> wrapper
|
|
|
+ .like(EquipmentBase::getEquipmentCode, listInDTO.getKeyword())
|
|
|
+ .or()
|
|
|
+ .like(EquipmentBase::getEquipmentName, listInDTO.getKeyword())
|
|
|
+ .or()
|
|
|
+ .like(EquipmentBase::getEquipmentLocation, listInDTO.getKeyword()))
|
|
|
.orderByDesc(EquipmentBase::getUpdateTime);
|
|
|
List<EquipmentBase> equipmentBaseList = this.list(queryWrapper);
|
|
|
if (CollUtil.isEmpty(equipmentBaseList)) {
|