From e68e0776bc3dc8b91b2d5b0fb5ee0d0786960cb2 Mon Sep 17 00:00:00 2001
From: Administrator <wuchunquan@fecr.com.cn>
Date: Fri, 17 Mar 2023 15:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Crud/DailyCrud.py       |  2 ++
 Router/DailyRouter.py   | 12 ++++++++----
 Router/UserRouter.py    | 11 ++++++-----
 Schemas/DailySchemas.py | 23 +++++++++++------------
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/Crud/DailyCrud.py b/Crud/DailyCrud.py
index 39cffe5..5224564 100644
--- a/Crud/DailyCrud.py
+++ b/Crud/DailyCrud.py
@@ -21,6 +21,8 @@ def daily_add(db: Session, data):
 def daily_change(db: Session, item_id, data):
     db.query(Daily).filter_by(id=item_id).update(data)
     db.commit()
+    item=db.query(Daily).filter_by(id=item_id).first()
+    return item
 
 
 def daily_delete(db: Session, item_id):
diff --git a/Router/DailyRouter.py b/Router/DailyRouter.py
index 3387794..d7fb6f1 100644
--- a/Router/DailyRouter.py
+++ b/Router/DailyRouter.py
@@ -26,7 +26,10 @@ router = APIRouter(
 @router.post("/daily_get", response_model=DailySchemas.DailyGetRes, summary="获取日报")
 def daily_get(req: DailySchemas.DailyGetReq, db: Session = Depends(get_db),
               token_data: TokenData = Depends(registered_depend)):
-    return DailySchemas.DailyGetRes(**DailyCrud.daily_get(db, req.id).to_dict())
+    item = DailyCrud.daily_get(db, req.id)
+    if not item:
+        raise HTTPException(detail="未取到信息")
+    return DailySchemas.DailyGetRes(**item.to_dict())
 
 
 @router.post("/daily_add", response_model=DailySchemas.DailyAddRes, summary="添加日报")
@@ -48,7 +51,8 @@ def daily_change(req: DailySchemas.DailyChangeReq, db: Session = Depends(get_db)
     # 本部门填报权限
     if str(req.department) not in token_data.department and not check_auth(token_data.auth_data, ['7']):
         raise HTTPException(detail="没有本部门填报权限", status_code=305)
-    return DailyCrud.daily_change(db, req.id, req.dict())
+    new_daily = DailyCrud.daily_change(db, req.id, req.dict())
+    return DailySchemas.DailyChangeRes(**new_daily.to_dict())
 
 
 @router.post("/daily_query", response_model=DailySchemas.DailyQueryRes, summary="查询日报")
@@ -76,6 +80,6 @@ def daily_query(req: DailySchemas.DailyQuery, db: Session = Depends(get_db),
 
 
 @router.post("/daily_delete", response_model=DailySchemas.DailyDeleteRes, summary="删除日报")
-def daily_delete(req: DailySchemas.DailyDeleteReq,db: Session = Depends(get_db),):
-    DailyCrud.daily_delete(db,req.id)
+def daily_delete(req: DailySchemas.DailyDeleteReq, db: Session = Depends(get_db), ):
+    DailyCrud.daily_delete(db, req.id)
     return DailySchemas.DailyDeleteRes(msg="删除成功", state=1)
diff --git a/Router/UserRouter.py b/Router/UserRouter.py
index 13e2db5..47c2dfb 100644
--- a/Router/UserRouter.py
+++ b/Router/UserRouter.py
@@ -75,19 +75,20 @@ def change_user_info(req: UserSchemas.ChangeUserInfoReq, token_data: TokenData =
 @router.post('/bind_email', tags=["用户接口"], summary='邮箱登录')
 def bind_email(req: UserSchemas.BindEmailReq,
                db: Session = Depends(get_db)):
-    checked = EmailVerifyCode.check_code(req.email, req.email_code, EmailVerifyType.change)
+    email= req.email.replace(" ","")
+    checked = EmailVerifyCode.check_code(email, req.email_code, EmailVerifyType.change)
     if not checked:
         raise HTTPException(detail="邮箱验证码错误", status_code=303)
-    user = UserCrud.get_user_info(db, req.email)
+    user = UserCrud.get_user_info(db, email)
     # if user:
     #     # 邮箱已绑定
     #     if user.email and user.email != req.email:
     #         raise HTTPException(detail="该微信已绑定邮箱，请使用该微信号绑定的邮箱登录", status_code=403)
     if not user:
-        user = UserCrud.create_user(db, req.email)
+        user = UserCrud.create_user(db, email)
     if not user.registered:
-        UserCrud.update_user_info_from_email(db, req.email)
-    auth_data = AuthCrud.get_user_auth(db, req.email)
+        UserCrud.update_user_info_from_email(db, email)
+    auth_data = AuthCrud.get_user_auth(db, email)
     user_data = user.to_dict()
     user_data["auth_data"] = auth_data
     token_data = TokenData(**user_data)
diff --git a/Schemas/DailySchemas.py b/Schemas/DailySchemas.py
index 8495c0e..5b7dabf 100644
--- a/Schemas/DailySchemas.py
+++ b/Schemas/DailySchemas.py
@@ -15,17 +15,17 @@ class DailyTypeEnum(Enum):
 
 
 class DailyInfo(BaseModel):
-    id: int
-    type: DailyTypeEnum
-    fill_user: str
-    title:str
-    department: int
-    user: UserInfo
-    post: int
-    content: str
-    daily_time: datetime
-    create_time: datetime
-    update_time: datetime
+    id: Optional[int]
+    type: Optional[DailyTypeEnum]
+    fill_user: Optional[str]
+    title:Optional[str]
+    department: Optional[int]
+    user: Optional[UserInfo]
+    post: Optional[int]
+    content: Optional[str]
+    daily_time: Optional[datetime]
+    create_time: Optional[datetime]
+    update_time: Optional[datetime]
 
 
 class DailyGetReq(BaseModel):
@@ -41,7 +41,6 @@ class DailyChangeReq(BaseModel):
     id: int
     type: Optional[DailyTypeEnum]
     fill_user: Optional[str]
-    name: Optional[str]
     title:Optional[str]
     department: Optional[int]
     post: Optional[int]