Merge pull request #2527 from s0urcelab/main

This commit is contained in:
jxxghp 2024-07-08 12:22:50 +08:00 committed by GitHub
commit 545b3c0482
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -57,6 +57,7 @@ class TransferHistory(Base):
).offset((page - 1) * count).limit(count).all() ).offset((page - 1) * count).limit(count).all()
else: else:
result = db.query(TransferHistory).filter(or_( result = db.query(TransferHistory).filter(or_(
TransferHistory.title.like(f'%{title}%'),
TransferHistory.src.like(f'%{title}%'), TransferHistory.src.like(f'%{title}%'),
TransferHistory.dest.like(f'%{title}%'), TransferHistory.dest.like(f'%{title}%'),
)).order_by( )).order_by(
@ -128,6 +129,7 @@ class TransferHistory(Base):
return db.query(func.count(TransferHistory.id)).filter(TransferHistory.status == status).first()[0] return db.query(func.count(TransferHistory.id)).filter(TransferHistory.status == status).first()[0]
else: else:
return db.query(func.count(TransferHistory.id)).filter(or_( return db.query(func.count(TransferHistory.id)).filter(or_(
TransferHistory.title.like(f'%{title}%'),
TransferHistory.src.like(f'%{title}%'), TransferHistory.src.like(f'%{title}%'),
TransferHistory.dest.like(f'%{title}%') TransferHistory.dest.like(f'%{title}%')
)).first()[0] )).first()[0]