bug修改
This commit is contained in:
parent
81eed62341
commit
8fda71381f
|
@ -1,10 +1,6 @@
|
||||||
from datetime import datetime
|
|
||||||
from sqlalchemy import func
|
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from Models.AuthModel import AuthRule, DefaultAuthRuleConfig
|
|
||||||
from Models.UserModel import User
|
from Models.UserModel import User
|
||||||
from Models.DepartmentModel import Department
|
from Models.DepartmentModel import Department
|
||||||
from Schemas.AuthSchemas import DefaultAuthConfigTypeEnum
|
|
||||||
|
|
||||||
|
|
||||||
def marge_auth_data(auth_data_list):
|
def marge_auth_data(auth_data_list):
|
||||||
|
@ -19,7 +15,6 @@ def marge_auth_data(auth_data_list):
|
||||||
|
|
||||||
|
|
||||||
def get_user_auth(db: Session, user_id):
|
def get_user_auth(db: Session, user_id):
|
||||||
print(user_id)
|
|
||||||
user = db.query(User).filter_by(openid=user_id).first()
|
user = db.query(User).filter_by(openid=user_id).first()
|
||||||
user_auth_data_str = user.auth_data
|
user_auth_data_str = user.auth_data
|
||||||
if not user.auth_data:
|
if not user.auth_data:
|
||||||
|
|
|
@ -25,7 +25,7 @@ router = APIRouter(
|
||||||
@router.post("/daily_get", response_model=DailySchemas.DailyGetRes, summary="获取日报")
|
@router.post("/daily_get", response_model=DailySchemas.DailyGetRes, summary="获取日报")
|
||||||
def daily_get(req: DailySchemas.DailyGetReq, db: Session = Depends(get_db),
|
def daily_get(req: DailySchemas.DailyGetReq, db: Session = Depends(get_db),
|
||||||
token_data: TokenData = Depends(token_data_depend)):
|
token_data: TokenData = Depends(token_data_depend)):
|
||||||
return DailyCrud.daily_get(db, req.id)
|
return DailySchemas.DailyGetRes(**DailyCrud.daily_get(db, req.id).to_dict())
|
||||||
|
|
||||||
|
|
||||||
@router.post("/daily_add", response_model=DailySchemas.DailyAddRes, summary="添加日报")
|
@router.post("/daily_add", response_model=DailySchemas.DailyAddRes, summary="添加日报")
|
||||||
|
|
|
@ -93,3 +93,4 @@ department_crud = auto_create_crud(Department, 'department', "部门", auto_crea
|
||||||
post_crud = auto_create_crud(Post, 'post', "职务", auto_create_keys=['id'], tags=["部门职务操作"])
|
post_crud = auto_create_crud(Post, 'post', "职务", auto_create_keys=['id'], tags=["部门职务操作"])
|
||||||
department_crud.mount(router)
|
department_crud.mount(router)
|
||||||
post_crud.mount(router)
|
post_crud.mount(router)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue