From 4868cb142b79698c20d586cd6b62c075488cd9f1 Mon Sep 17 00:00:00 2001
From: dylan <41266749+downdawn@users.noreply.github.com>
Date: Thu, 25 May 2023 18:43:31 +0800
Subject: [PATCH] update where query (#74)

---
 backend/app/crud/crud_user.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/app/crud/crud_user.py b/backend/app/crud/crud_user.py
index 8035d0a5..b1d2344d 100644
--- a/backend/app/crud/crud_user.py
+++ b/backend/app/crud/crud_user.py
@@ -104,16 +104,16 @@ class CRUDUser(CRUDBase[User, CreateUser, UpdateUser]):
     async def get_user_with_relation(
         self, db: AsyncSession, *, user_id: int = None, username: str = None
     ) -> User | None:
-        where = 'condition'
+        where = []
         if user_id:
-            where = 'self.model.id == user_id'
+            where.append(self.model.id == user_id)
         if username:
-            where = 'self.model.username == username'
+            where.append(self.model.username == username)
         user = await db.execute(
             select(self.model)
-            .where(eval(where))
             .options(selectinload(self.model.dept))
             .options(selectinload(self.model.roles).joinedload(Role.menus))
+            .where(*where)
         )
         return user.scalars().first()