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
d0e82b56ab
commit
f1baf96f95
1 changed files with 10 additions and 10 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. 20
      ruoyi-fastapi-backend/module_admin/dao/dept_dao.py

20
ruoyi-fastapi-backend/module_admin/dao/dept_dao.py
View File

@ -22,8 +22,8 @@ class DeptDao:
dept_info = (await db.execute( dept_info = (await db.execute(
select(SysDept) select(SysDept)
.where(SysDept.dept_id == dept_id, .where(SysDept.dept_id == dept_id,
SysDept.status == 0, SysDept.status == '0',
SysDept.del_flag == 0) SysDept.del_flag == '0')
)).scalars().first() )).scalars().first()
return dept_info return dept_info
@ -39,7 +39,7 @@ class DeptDao:
dept_info = (await db.execute( dept_info = (await db.execute(
select(SysDept) select(SysDept)
.where(SysDept.dept_id == dept_id, .where(SysDept.dept_id == dept_id,
SysDept.del_flag == 0) SysDept.del_flag == '0')
)).scalars().first() )).scalars().first()
return dept_info return dept_info
@ -55,7 +55,7 @@ class DeptDao:
dept_info = (await db.execute( dept_info = (await db.execute(
select(SysDept) select(SysDept)
.where(SysDept.dept_id == dept_id, .where(SysDept.dept_id == dept_id,
SysDept.del_flag == 0) SysDept.del_flag == '0')
)).scalars().first() )).scalars().first()
return dept_info return dept_info
@ -89,7 +89,7 @@ class DeptDao:
select(SysDept) select(SysDept)
.where(SysDept.dept_id != dept_info.dept_id, .where(SysDept.dept_id != dept_info.dept_id,
SysDept.parent_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)) eval(data_scope_sql))
.order_by(SysDept.order_num) .order_by(SysDept.order_num)
.distinct() .distinct()
@ -108,7 +108,7 @@ class DeptDao:
dept_result = (await db.execute( dept_result = (await db.execute(
select(SysDept) select(SysDept)
.where(SysDept.parent_id == dept_id, .where(SysDept.parent_id == dept_id,
SysDept.del_flag == 0) SysDept.del_flag == '0')
)).scalars().all() )).scalars().all()
return list_format_datetime(dept_result) return list_format_datetime(dept_result)
@ -122,7 +122,7 @@ class DeptDao:
""" """
ancestors = (await db.execute( ancestors = (await db.execute(
select(SysDept.ancestors) select(SysDept.ancestors)
.where(SysDept.del_flag == 0) .where(SysDept.del_flag == '0')
)).scalars().all() )).scalars().all()
return ancestors return ancestors
@ -138,8 +138,8 @@ class DeptDao:
""" """
dept_result = (await db.execute( dept_result = (await db.execute(
select(SysDept) select(SysDept)
.where(SysDept.status == 0, .where(SysDept.status == '0',
SysDept.del_flag == 0, SysDept.del_flag == '0',
SysDept.dept_name.like(f'%{dept_info.dept_name}%') if dept_info.dept_name else True, SysDept.dept_name.like(f'%{dept_info.dept_name}%') if dept_info.dept_name else True,
eval(data_scope_sql)) eval(data_scope_sql))
.order_by(SysDept.order_num) .order_by(SysDept.order_num)
@ -159,7 +159,7 @@ class DeptDao:
""" """
dept_result = (await db.execute( dept_result = (await db.execute(
select(SysDept) select(SysDept)
.where(SysDept.del_flag == 0, .where(SysDept.del_flag == '0',
SysDept.status == page_object.status if page_object.status else True, 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, SysDept.dept_name.like(f'%{page_object.dept_name}%') if page_object.dept_name else True,
eval(data_scope_sql)) eval(data_scope_sql))

Write Preview
Loading…
Cancel
Save