fix rebase conflicts

This commit is contained in:
Hongbo Wu 2024-04-23 16:04:59 +08:00
parent 2f7c18b363
commit 0faafa0786

View file

@ -647,17 +647,15 @@ export const buildQuery = (
args.useFolders
)
}
queryBuilder.where('library_item.user_id = :userId', { userId })
// add select
selects.forEach((select) => {
queryBuilder.addSelect(select.column, select.alias)
})
queryBuilder.select(selects.map((select) => select.column))
if (args.includeContent) {
queryBuilder.addSelect('library_item.readableContent')
}
queryBuilder.where('library_item.user_id = :userId', { userId })
if (!args.includePending) {
queryBuilder.andWhere("library_item.state <> 'PROCESSING'")
}