bug修改
This commit is contained in:
parent
8fda71381f
commit
670d0553c5
|
@ -30,7 +30,7 @@ def daily_query(db: Session, params: DailyQuery) -> [int]:
|
||||||
print(key, value)
|
print(key, value)
|
||||||
if key not in ['page', 'page_size'] and value is not None:
|
if key not in ['page', 'page_size'] and value is not None:
|
||||||
# 在存储的数组值内查询 如存的 1,2,3,4 查询时则使用的 [1,2]这样的数据来查
|
# 在存储的数组值内查询 如存的 1,2,3,4 查询时则使用的 [1,2]这样的数据来查
|
||||||
if key in ['department', 'post']:
|
if key in ["xx"]:
|
||||||
for item in value:
|
for item in value:
|
||||||
query = query.filter(func.find_in_set(str(item), getattr(db_model, key)))
|
query = query.filter(func.find_in_set(str(item), getattr(db_model, key)))
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -53,6 +53,7 @@ def daily_change(req: DailySchemas.DailyChangeReq, db: Session = Depends(get_db)
|
||||||
@router.post("/daily_query", response_model=DailySchemas.DailyQueryRes, summary="查询日报")
|
@router.post("/daily_query", response_model=DailySchemas.DailyQueryRes, summary="查询日报")
|
||||||
def daily_query(req: DailySchemas.DailyQuery, db: Session = Depends(get_db),
|
def daily_query(req: DailySchemas.DailyQuery, db: Session = Depends(get_db),
|
||||||
token_data: TokenData = Depends(token_data_depend)):
|
token_data: TokenData = Depends(token_data_depend)):
|
||||||
|
print(req,"req")
|
||||||
if not req.department and not check_auth(token_data.auth_data, [2]):
|
if not req.department and not check_auth(token_data.auth_data, [2]):
|
||||||
raise HTTPException(detail="无所有部门动态查看权限", status_code=305)
|
raise HTTPException(detail="无所有部门动态查看权限", status_code=305)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -18,6 +18,7 @@ class DailyInfo(BaseModel):
|
||||||
id: int
|
id: int
|
||||||
type: DailyTypeEnum
|
type: DailyTypeEnum
|
||||||
fill_user: str
|
fill_user: str
|
||||||
|
title:str
|
||||||
department: int
|
department: int
|
||||||
user: UserInfo
|
user: UserInfo
|
||||||
post: int
|
post: int
|
||||||
|
@ -41,6 +42,7 @@ class DailyChangeReq(BaseModel):
|
||||||
type: Optional[DailyTypeEnum]
|
type: Optional[DailyTypeEnum]
|
||||||
fill_user: Optional[str]
|
fill_user: Optional[str]
|
||||||
name: Optional[str]
|
name: Optional[str]
|
||||||
|
title:Optional[str]
|
||||||
department: Optional[int]
|
department: Optional[int]
|
||||||
post: Optional[int]
|
post: Optional[int]
|
||||||
content: Optional[str]
|
content: Optional[str]
|
||||||
|
@ -58,8 +60,9 @@ class DailyQuery(BaseModel):
|
||||||
type: Optional[DailyTypeEnum]
|
type: Optional[DailyTypeEnum]
|
||||||
fill_user: Optional[str]
|
fill_user: Optional[str]
|
||||||
name: Optional[str]
|
name: Optional[str]
|
||||||
department: Optional[List[int]]
|
title:Optional[str]
|
||||||
post: Optional[List[int]]
|
department: Optional[int]
|
||||||
|
post: Optional[int]
|
||||||
content: Optional[str]
|
content: Optional[str]
|
||||||
daily_time: Optional[datetime]
|
daily_time: Optional[datetime]
|
||||||
create_time: Optional[datetime]
|
create_time: Optional[datetime]
|
||||||
|
|
Loading…
Reference in New Issue