From 0912abdf295950e6e1770136d73574051e45dcad Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Tue, 19 Nov 2024 20:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=88=B0=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=B5=8B=E8=AF=95=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/login_reg.py   | 2 ++
 api/manage_user.py | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/login_reg.py b/api/login_reg.py
index 0937b19..43ef044 100644
--- a/api/login_reg.py
+++ b/api/login_reg.py
@@ -30,6 +30,8 @@ def create_access_token(data: dict, expires_delta: Optional[timedelta] = None, s
 # 登录路由
 @router.post("/api/s1/login")
 async def login(response: Response, user_data: dict, session: SessionDep):
+    if user_data.get('username') is None or user_data.get('password') is None:
+        raise HTTPException(status_code=401, detail="用户名或密码不能为空")
     # 查询用户
     user = session.exec(select(User).where(User.username == user_data['username'])).first()
 
diff --git a/api/manage_user.py b/api/manage_user.py
index 9900b1c..e114207 100644
--- a/api/manage_user.py
+++ b/api/manage_user.py
@@ -42,11 +42,9 @@ 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()
 
     if user:
-        if password == "":
-            user.role = role
-        else:
+        if password and password != "":
             user.password = password
-            user.role = role
+        user.role = role
         session.add(user)
         session.commit()
         return {"detail": "User updated successfully"}