diff --git a/Crud/DailyCrud.py b/Crud/DailyCrud.py index d21ec4f..634363b 100644 --- a/Crud/DailyCrud.py +++ b/Crud/DailyCrud.py @@ -30,7 +30,7 @@ def daily_query(db: Session, params: DailyQuery) -> [int]: print(key, value) if key not in ['page', 'page_size'] and value is not None: # 在存储的数组值内查询 如存的 1,2,3,4 查询时则使用的 [1,2]这样的数据来查 - if key in ['department', 'post']: + if key in ["xx"]: for item in value: query = query.filter(func.find_in_set(str(item), getattr(db_model, key))) continue diff --git a/Router/DailyRouter.py b/Router/DailyRouter.py index fa15a46..ee63b1d 100644 --- a/Router/DailyRouter.py +++ b/Router/DailyRouter.py @@ -53,6 +53,7 @@ def daily_change(req: DailySchemas.DailyChangeReq, db: Session = Depends(get_db) @router.post("/daily_query", response_model=DailySchemas.DailyQueryRes, summary="查询日报") def daily_query(req: DailySchemas.DailyQuery, db: Session = Depends(get_db), token_data: TokenData = Depends(token_data_depend)): + print(req,"req") if not req.department and not check_auth(token_data.auth_data, [2]): raise HTTPException(detail="无所有部门动态查看权限", status_code=305) else: diff --git a/Schemas/DailySchemas.py b/Schemas/DailySchemas.py index 5da1043..74bfe68 100644 --- a/Schemas/DailySchemas.py +++ b/Schemas/DailySchemas.py @@ -18,6 +18,7 @@ class DailyInfo(BaseModel): id: int type: DailyTypeEnum fill_user: str + title:str department: int user: UserInfo post: int @@ -41,6 +42,7 @@ class DailyChangeReq(BaseModel): type: Optional[DailyTypeEnum] fill_user: Optional[str] name: Optional[str] + title:Optional[str] department: Optional[int] post: Optional[int] content: Optional[str] @@ -58,8 +60,9 @@ class DailyQuery(BaseModel): type: Optional[DailyTypeEnum] fill_user: Optional[str] name: Optional[str] - department: Optional[List[int]] - post: Optional[List[int]] + title:Optional[str] + department: Optional[int] + post: Optional[int] content: Optional[str] daily_time: Optional[datetime] create_time: Optional[datetime]