From fe30e85ad48a5fd787940cf9d58fb87a12b0b562 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 26 十二月 2024 10:28:55 +0800
Subject: [PATCH] 注册用户权限同步
---
app/api/user.py | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/app/api/user.py b/app/api/user.py
index efd0ada..e9331c6 100644
--- a/app/api/user.py
+++ b/app/api/user.py
@@ -1,5 +1,6 @@
from fastapi import APIRouter, Depends
from app.api import Response, pwd_context, get_current_user, ResponseList
+from app.config.const import USER_STATSU_DELETE
from app.models.base_model import get_db
from app.models.user import PageParameter, UserStatus, UserInfo, LoginData, UserPassword, UserDept
from app.models.user_model import UserModel
@@ -25,7 +26,7 @@
if user.pwd:
if not is_valid_password(user.pwd):
return Response(code=400, msg="The password must be at least 8 and contain both numbers and letters")
- db_user = db.query(UserModel).filter(UserModel.username == user.userName).first()
+ db_user = db.query(UserModel).filter(UserModel.username == user.userName, UserModel.status != USER_STATSU_DELETE).first()
if db_user:
return Response(code=200, msg="user already created")
pwd = user.pwd
@@ -40,14 +41,9 @@
@user_router.put("/edit_user", response_model=Response)
async def edit_user(user: UserInfo, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- # if not user.userName:
- # return Response(code=400, msg="The userName cannot be empty!")
user_info = db.query(UserModel).filter(UserModel.id == user.userId).first()
if not user_info:
return Response(code=200, msg="user does not exist")
- # db_user = db.query(UserModel).filter(UserModel.username == user.userName).first()
- # if db_user and db_user.id != user.userId:
- # return Response(code=200, msg="user already created")
is_edit = await edit_user_data(db, user.userId, user.email, user.phone, user.loginName, user.roles, user.groups)
if not is_edit:
return Response(code=500, msg="user edit failure", data={})
--
Gitblit v1.8.0