From 91062dda27e06bf29eaa78eff47ba505ad19b7a2 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期三, 18 十二月 2024 16:00:31 +0800 Subject: [PATCH] 机构接口优化 --- app/api/organization.py | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/api/organization.py b/app/api/organization.py index a660c16..eab77c7 100644 --- a/app/api/organization.py +++ b/app/api/organization.py @@ -1,11 +1,11 @@ from fastapi import APIRouter, Depends from app.api import Response, pwd_context, get_current_user -from app.models import DeptList, DeptInfo, DeptParent +from app.models import DeptList, DeptInfo, DeptParent, DeptStatus from app.models.base_model import get_db from app.models.user import PageParameter, UserStatus, UserInfo, LoginData from app.models.user_model import UserModel from app.service.organization import get_organization_list, create_dept, edit_dept_data, edit_dept_parent, \ - get_organization_info, delete_organization_info + get_organization_info, delete_organization_info, edit_organization_status dept_router = APIRouter() @@ -54,15 +54,17 @@ @dept_router.delete("/{deptId}", response_model=Response) async def delete_dept(deptId, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)): - is_edit = await delete_organization_info(db, deptId) - if not is_edit: - return Response(code=500, msg="dept delete failure", data={}) + msg = await delete_organization_info(db, deptId) + if msg: + return Response(code=400, msg=f"{msg}", data={}) return Response(code=200, msg="dept delete successfully", data={}) -@dept_router.delete("/{deptId}", response_model=Response) -async def delete_dept(deptId, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)): - is_edit = await delete_organization_info(db, deptId) - if not is_edit: - return Response(code=500, msg="dept delete failure", data={}) +@dept_router.put("/status", response_model=Response) +async def edit_status_api(dept: DeptStatus, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)): + if dept.status not in ["0", '1']: + return Response(code=400, msg="鏈煡鐘舵�侊紒", data={}) + msg = await edit_organization_status(db, dept.deptId, dept.status) + if msg: + return Response(code=400, msg=f"{msg}", data={}) return Response(code=200, msg="dept delete successfully", data={}) -- Gitblit v1.8.0