Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
8fbc74981b
|
@ -63,13 +63,14 @@ def daily_query(db: Session, params: DailyQuery, token_data: TokenData) -> [int]
|
|||
|
||||
query_department = [d for d in departments if d not in 业务部门]
|
||||
if query_department:
|
||||
query = query.filter(or_(Daily.department.in_(query_department),
|
||||
)).filter(
|
||||
or_(*[func.find_in_set(str(item), Daily.required_auth) for item in has_auth],
|
||||
Daily.required_auth == None, Daily.required_auth == '',
|
||||
Daily.fill_user == token_data.email
|
||||
)
|
||||
)
|
||||
query = query.filter(or_(Daily.department.in_(query_department),Daily.fill_user == token_data.email
|
||||
))
|
||||
# .filter(
|
||||
# or_(*[func.find_in_set(str(item), Daily.required_auth) for item in has_auth],
|
||||
# Daily.required_auth == None, Daily.required_auth == '',
|
||||
# Daily.fill_user == token_data.email
|
||||
# )
|
||||
# )
|
||||
else:
|
||||
query = query.filter(Daily.fill_user == token_data.email)
|
||||
# 能看到自己动态 ,但看不到同部门的保密日报
|
||||
|
|
Loading…
Reference in New Issue