From 3b1bf7da6771bd1d6852d3dcc1f906d5ae5c95d1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 12 三月 2025 13:49:12 +0800
Subject: [PATCH] 增加内容优化
---
app/api/organization.py | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/app/api/organization.py b/app/api/organization.py
index 3589c07..e5e73a6 100644
--- a/app/api/organization.py
+++ b/app/api/organization.py
@@ -1,25 +1,25 @@
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()
@dept_router.get("/list", response_model=Response)
-async def organization_list(paras: DeptList,current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- return Response(code=200, msg="", data=await get_organization_list(db, paras.deptName))
+async def organization_list(deptName="",current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ return Response(code=200, msg="", data=await get_organization_list(db, deptName))
@dept_router.post("/add_dept", response_model=Response)
async def add_dept(dept: DeptInfo, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
if not dept.deptName:
return Response(code=400, msg="The deptName cannot be empty!")
- if dept.status not in ["0", "1"]:
+ if dept.status not in ["0", "1", 0, 1]:
return Response(code=400, msg="The status cannot be {}!".format(dept.status))
is_create = await create_dept(db, dept.deptName, dept.leader, dept.phone, dept.address, dept.status, dept.orderNum, dept.roles, dept.groups, dept.parentId)
if not is_create:
@@ -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={})
- return Response(code=200, msg="dept delete successfully", 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', 0, 1]:
+ return Response(code=400, msg="鏈煡鐘舵�侊紒", data={})
+ msg = await edit_organization_status(db, dept.deptId, str(dept.status))
+ if msg:
+ return Response(code=400, msg=f"{msg}", data={})
+ return Response(code=200, msg="dept status update successfully", data={})
--
Gitblit v1.8.0