developers
/
vue-fastapi-admin
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

perf: 优化菜单管理dao层status和del_flag类型与数据库保持一致

master
insistence 7 months ago
parent
7bb947c14a
commit
1fa14118ff
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ruoyi-fastapi-backend/module_admin/dao/menu_dao.py

12
ruoyi-fastapi-backend/module_admin/dao/menu_dao.py
View File

@ -56,7 +56,7 @@ class MenuDao:
if 1 in role_id_list: if 1 in role_id_list:
menu_query_all = (await db.execute( menu_query_all = (await db.execute(
select(SysMenu) select(SysMenu)
.where(SysMenu.status == 0) .where(SysMenu.status == '0')
.order_by(SysMenu.order_num) .order_by(SysMenu.order_num)
.distinct() .distinct()
)).scalars().all() )).scalars().all()
@ -64,13 +64,13 @@ class MenuDao:
menu_query_all = (await db.execute( menu_query_all = (await db.execute(
select(SysMenu) select(SysMenu)
.select_from(SysUser) .select_from(SysUser)
.where(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) .where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True) .join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(SysRole, .join(SysRole,
and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0), and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'),
isouter=True) isouter=True)
.join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True) .join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True)
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) .join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == '0'))
.order_by(SysMenu.order_num) .order_by(SysMenu.order_num)
.distinct() .distinct()
)).scalars().all() )).scalars().all()
@ -101,10 +101,10 @@ class MenuDao:
menu_query_all = (await db.execute( menu_query_all = (await db.execute(
select(SysMenu) select(SysMenu)
.select_from(SysUser) .select_from(SysUser)
.where(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) .where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True) .join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(SysRole, .join(SysRole,
and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0), and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'),
isouter=True) isouter=True)
.join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True) .join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True)
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, .join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id,

Write Preview
Loading…
Cancel
Save