Skip to content

Commit 960d9f6

Browse files
authored
Update the default value for some functions (#573)
* Update the default value for some functions * Fix lint
1 parent 085f08e commit 960d9f6

24 files changed

+29
-34
lines changed

backend/app/admin/crud/crud_data_rule.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async def get(self, db: AsyncSession, pk: int) -> DataRule | None:
2424
"""
2525
return await self.select_model(db, pk)
2626

27-
async def get_list(self, name: str | None = None) -> Select:
27+
async def get_list(self, name: str | None) -> Select:
2828
"""
2929
获取规则列表
3030

backend/app/admin/crud/crud_dept.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ async def get_by_name(self, db: AsyncSession, name: str) -> Dept | None:
3535
return await self.select_model_by_column(db, name=name, del_flag=0)
3636

3737
async def get_all(
38-
self,
39-
db: AsyncSession,
40-
name: str | None = None,
41-
leader: str | None = None,
42-
phone: str | None = None,
43-
status: int | None = None,
38+
self, db: AsyncSession, name: str | None, leader: str | None, phone: str | None, status: int | None
4439
) -> Sequence[Dept]:
4540
"""
4641
获取所有部门

backend/app/admin/crud/crud_login_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class CRUDLoginLog(CRUDPlus[LoginLog]):
1212
"""登录日志数据库操作类"""
1313

14-
async def get_list(self, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select:
14+
async def get_list(self, username: str | None, status: int | None, ip: str | None) -> Select:
1515
"""
1616
获取登录日志列表
1717

backend/app/admin/crud/crud_menu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ async def get_by_title(self, db: AsyncSession, title: str) -> Menu | None:
3434
"""
3535
return await self.select_model_by_column(db, title=title, menu_type__ne=2)
3636

37-
async def get_all(self, db: AsyncSession, title: str | None = None, status: int | None = None) -> Sequence[Menu]:
37+
async def get_all(self, db: AsyncSession, title: str | None, status: int | None) -> Sequence[Menu]:
3838
"""
3939
获取菜单列表
4040

backend/app/admin/crud/crud_opera_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class CRUDOperaLogDao(CRUDPlus[OperaLog]):
1212
"""操作日志数据库操作类"""
1313

14-
async def get_list(self, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select:
14+
async def get_list(self, username: str | None, status: int | None, ip: str | None) -> Select:
1515
"""
1616
获取操作日志列表
1717

backend/app/admin/crud/crud_role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ async def get_by_user(self, db: AsyncSession, user_id: int) -> Sequence[Role]:
6666
roles = await db.execute(stmt)
6767
return roles.scalars().all()
6868

69-
async def get_list(self, name: str | None = None, status: int | None = None) -> Select:
69+
async def get_list(self, name: str | None, status: int | None) -> Select:
7070
"""
7171
获取角色列表
7272

backend/app/admin/crud/crud_user.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,7 @@ async def reset_password(self, db: AsyncSession, pk: int, new_pwd: str) -> int:
175175
"""
176176
return await self.update_model(db, pk, {'password': new_pwd})
177177

178-
async def get_list(
179-
self, dept: int | None = None, username: str | None = None, phone: str | None = None, status: int | None = None
180-
) -> Select:
178+
async def get_list(self, dept: int | None, username: str | None, phone: str | None, status: int | None) -> Select:
181179
"""
182180
获取用户列表
183181

backend/app/admin/service/data_rule_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ async def get_columns(model: str) -> list[str]:
7070
return model_columns
7171

7272
@staticmethod
73-
async def get_select(*, name: str | None = None) -> Select:
73+
async def get_select(*, name: str | None) -> Select:
7474
"""
7575
获取数据规则列表查询条件
7676

backend/app/admin/service/dept_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async def get(*, pk: int) -> Dept:
3333

3434
@staticmethod
3535
async def get_dept_tree(
36-
*, name: str | None = None, leader: str | None = None, phone: str | None = None, status: int | None = None
36+
*, name: str | None, leader: str | None, phone: str | None, status: int | None
3737
) -> list[dict[str, Any]]:
3838
"""
3939
获取部门树形结构

backend/app/admin/service/login_log_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class LoginLogService:
1616
"""登录日志服务类"""
1717

1818
@staticmethod
19-
async def get_select(*, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select:
19+
async def get_select(*, username: str | None, status: int | None, ip: str | None) -> Select:
2020
"""
2121
获取登录日志列表查询条件
2222

0 commit comments

Comments
 (0)