逻辑优化
This commit is contained in:
parent
4cf43c75d9
commit
854c5568e2
@ -30,7 +30,7 @@ async def add_or_update_user(data: dict, session: SessionDep, current_user: User
|
|||||||
raise HTTPException(status_code=403, detail="Only admin users can add or update users")
|
raise HTTPException(status_code=403, detail="Only admin users can add or update users")
|
||||||
|
|
||||||
username = data.get("username")
|
username = data.get("username")
|
||||||
password = data.get("password")
|
password = data.get("password", None)
|
||||||
role = data.get("role")
|
role = data.get("role")
|
||||||
if role not in ["auditor", "estimator"]:
|
if role not in ["auditor", "estimator"]:
|
||||||
raise HTTPException(status_code=400, detail="Invalid role")
|
raise HTTPException(status_code=400, detail="Invalid role")
|
||||||
@ -42,7 +42,7 @@ async def add_or_update_user(data: dict, session: SessionDep, current_user: User
|
|||||||
user = session.exec(select(User).where(User.username == username, User.tenant_id == current_user.tenant_id)).first()
|
user = session.exec(select(User).where(User.username == username, User.tenant_id == current_user.tenant_id)).first()
|
||||||
|
|
||||||
if user:
|
if user:
|
||||||
if password and password != "":
|
if password:
|
||||||
user.password = password
|
user.password = password
|
||||||
user.role = role
|
user.role = role
|
||||||
session.add(user)
|
session.add(user)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user