From 0d2aa3e8b83c41847aee9e25350e357279b6197f Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Mon, 1 Jul 2024 21:50:15 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86dao=E5=B1=82status=E5=92=8Cdel=5Fflag?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/module_admin/dao/role_dao.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/dao/role_dao.py b/ruoyi-fastapi-backend/module_admin/dao/role_dao.py index 9c43550..1d5a1fa 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/role_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/role_dao.py @@ -22,7 +22,7 @@ class RoleDao: """ query_role_info = (await db.execute( select(SysRole) - .where(SysRole.status == 0, SysRole.del_flag == 0, SysRole.role_name == role_name) + .where(SysRole.status == '0', SysRole.del_flag == '0', SysRole.role_name == role_name) .order_by(desc(SysRole.create_time)) .distinct() )).scalars().first() @@ -39,7 +39,7 @@ class RoleDao: """ query_role_info = (await db.execute( select(SysRole) - .where(SysRole.del_flag == 0, + .where(SysRole.del_flag == '0', SysRole.role_name == role.role_name if role.role_name else True, SysRole.role_key == role.role_key if role.role_key else True) .order_by(desc(SysRole.create_time)) @@ -59,8 +59,8 @@ class RoleDao: role_info = (await db.execute( select(SysRole) .where(SysRole.role_id == role_id, - SysRole.status == 0, - SysRole.del_flag == 0) + SysRole.status == '0', + SysRole.del_flag == '0') )).scalars().first() return role_info @@ -75,7 +75,7 @@ class RoleDao: """ query_role_info = (await db.execute( select(SysRole) - .where(SysRole.del_flag == 0, SysRole.role_id == role_id) + .where(SysRole.del_flag == '0', SysRole.role_id == role_id) .distinct() )).scalars().first() @@ -90,7 +90,7 @@ class RoleDao: """ role_info = (await db.execute( select(SysRole) - .where(SysRole.role_id != 1, SysRole.status == 0, SysRole.del_flag == 0) + .where(SysRole.role_id != 1, SysRole.status == '0', SysRole.del_flag == '0') )).scalars().all() return role_info @@ -105,7 +105,7 @@ class RoleDao: :return: 角色列表信息对象 """ query = select(SysRole) \ - .where(SysRole.del_flag == 0, + .where(SysRole.del_flag == '0', SysRole.role_name.like(f'%{query_object.role_name}%') if query_object.role_name else True, SysRole.role_key.like(f'%{query_object.role_key}%') if query_object.role_key else True, SysRole.status == query_object.status if query_object.status else True,