From f1baf96f951a1bcca204bf23bc990939c1b6f71e Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Mon, 1 Jul 2024 21:35:29 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=83=A8=E9=97=A8?= =?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 --- .../module_admin/dao/dept_dao.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/dao/dept_dao.py b/ruoyi-fastapi-backend/module_admin/dao/dept_dao.py index c5169a5..e15278b 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/dept_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/dept_dao.py @@ -22,8 +22,8 @@ class DeptDao: dept_info = (await db.execute( select(SysDept) .where(SysDept.dept_id == dept_id, - SysDept.status == 0, - SysDept.del_flag == 0) + SysDept.status == '0', + SysDept.del_flag == '0') )).scalars().first() return dept_info @@ -39,7 +39,7 @@ class DeptDao: dept_info = (await db.execute( select(SysDept) .where(SysDept.dept_id == dept_id, - SysDept.del_flag == 0) + SysDept.del_flag == '0') )).scalars().first() return dept_info @@ -55,7 +55,7 @@ class DeptDao: dept_info = (await db.execute( select(SysDept) .where(SysDept.dept_id == dept_id, - SysDept.del_flag == 0) + SysDept.del_flag == '0') )).scalars().first() return dept_info @@ -89,7 +89,7 @@ class DeptDao: select(SysDept) .where(SysDept.dept_id != dept_info.dept_id, SysDept.parent_id != dept_info.dept_id, - SysDept.del_flag == 0, SysDept.status == 0, + SysDept.del_flag == '0', SysDept.status == '0', eval(data_scope_sql)) .order_by(SysDept.order_num) .distinct() @@ -108,7 +108,7 @@ class DeptDao: dept_result = (await db.execute( select(SysDept) .where(SysDept.parent_id == dept_id, - SysDept.del_flag == 0) + SysDept.del_flag == '0') )).scalars().all() return list_format_datetime(dept_result) @@ -122,7 +122,7 @@ class DeptDao: """ ancestors = (await db.execute( select(SysDept.ancestors) - .where(SysDept.del_flag == 0) + .where(SysDept.del_flag == '0') )).scalars().all() return ancestors @@ -138,8 +138,8 @@ class DeptDao: """ dept_result = (await db.execute( select(SysDept) - .where(SysDept.status == 0, - SysDept.del_flag == 0, + .where(SysDept.status == '0', + SysDept.del_flag == '0', SysDept.dept_name.like(f'%{dept_info.dept_name}%') if dept_info.dept_name else True, eval(data_scope_sql)) .order_by(SysDept.order_num) @@ -159,7 +159,7 @@ class DeptDao: """ dept_result = (await db.execute( select(SysDept) - .where(SysDept.del_flag == 0, + .where(SysDept.del_flag == '0', SysDept.status == page_object.status if page_object.status else True, SysDept.dept_name.like(f'%{page_object.dept_name}%') if page_object.dept_name else True, eval(data_scope_sql))