diff --git a/Crud/ProjectCrud.py b/Crud/ProjectCrud.py index 763b796..498dd6d 100644 --- a/Crud/ProjectCrud.py +++ b/Crud/ProjectCrud.py @@ -30,16 +30,16 @@ def query_data_by_department(db: Session, schema: ProjectSchemas.QueryProjectByD page = schema.page pagesize = schema.pagesize - item = db.query(ProjectDataSheet).filter_by(departments=department).first() + item = db.query(ProjectDataSheet).filter(func.find_in_set(department, ProjectDataSheet.departments)).first() if not item: return False page = 1 if page < 1 else (100 if page > 100 else page) pagesize = 5 if pagesize < 5 else (10 if pagesize > 10 else pagesize) - items = db.query(ProjectDataSheet).filter_by(departments=department).offset( + items = db.query(ProjectDataSheet).filter(func.find_in_set(department, ProjectDataSheet.departments)).offset( (page - 1) * pagesize).limit(pagesize).all() - count = db.query(ProjectDataSheet).filter_by(departments=department).count() + count = db.query(ProjectDataSheet).filter(func.find_in_set(department, ProjectDataSheet.departments)).count() return { "total": count,