Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/admin/crud/crud_data_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async def get(self, db: AsyncSession, pk: int) -> DataRule | None:
"""
return await self.select_model(db, pk)

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

Expand Down
7 changes: 1 addition & 6 deletions backend/app/admin/crud/crud_dept.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ async def get_by_name(self, db: AsyncSession, name: str) -> Dept | None:
return await self.select_model_by_column(db, name=name, del_flag=0)

async def get_all(
self,
db: AsyncSession,
name: str | None = None,
leader: str | None = None,
phone: str | None = None,
status: int | None = None,
self, db: AsyncSession, name: str | None, leader: str | None, phone: str | None, status: int | None
) -> Sequence[Dept]:
"""
获取所有部门
Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/crud/crud_login_log.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class CRUDLoginLog(CRUDPlus[LoginLog]):
"""登录日志数据库操作类"""

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

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/crud/crud_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async def get_by_title(self, db: AsyncSession, title: str) -> Menu | None:
"""
return await self.select_model_by_column(db, title=title, menu_type__ne=2)

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

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/crud/crud_opera_log.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class CRUDOperaLogDao(CRUDPlus[OperaLog]):
"""操作日志数据库操作类"""

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

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/crud/crud_role.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async def get_by_user(self, db: AsyncSession, user_id: int) -> Sequence[Role]:
roles = await db.execute(stmt)
return roles.scalars().all()

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

Expand Down
4 changes: 1 addition & 3 deletions backend/app/admin/crud/crud_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,7 @@ async def reset_password(self, db: AsyncSession, pk: int, new_pwd: str) -> int:
"""
return await self.update_model(db, pk, {'password': new_pwd})

async def get_list(
self, dept: int | None = None, username: str | None = None, phone: str | None = None, status: int | None = None
) -> Select:
async def get_list(self, dept: int | None, username: str | None, phone: str | None, status: int | None) -> Select:
"""
获取用户列表

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/service/data_rule_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ async def get_columns(model: str) -> list[str]:
return model_columns

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

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/service/dept_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ async def get(*, pk: int) -> Dept:

@staticmethod
async def get_dept_tree(
*, name: str | None = None, leader: str | None = None, phone: str | None = None, status: int | None = None
*, name: str | None, leader: str | None, phone: str | None, status: int | None
) -> list[dict[str, Any]]:
"""
获取部门树形结构
Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/service/login_log_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class LoginLogService:
"""登录日志服务类"""

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

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/service/menu_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ async def get(*, pk: int) -> Menu:
return menu

@staticmethod
async def get_menu_tree(*, title: str | None = None, status: int | None = None) -> list[dict[str, Any]]:
async def get_menu_tree(*, title: str | None, status: int | None) -> list[dict[str, Any]]:
"""
获取菜单树形结构

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/service/opera_log_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class OperaLogService:
"""操作日志服务类"""

@staticmethod
async def get_select(*, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select:
async def get_select(*, username: str | None, status: int | None, ip: str | None) -> Select:
"""
获取操作日志列表查询条件

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/service/role_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ async def get_by_user(*, pk: int) -> Sequence[Role]:
return roles

@staticmethod
async def get_select(*, name: str | None = None, status: int | None = None) -> Select:
async def get_select(*, name: str | None, status: int | None) -> Select:
"""
获取角色列表查询条件

Expand Down
2 changes: 1 addition & 1 deletion backend/app/admin/service/user_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ async def update_avatar(*, request: Request, username: str, avatar: AvatarParam)
return count

@staticmethod
async def get_select(*, dept: int, username: str = None, phone: str = None, status: int = None) -> Select:
async def get_select(*, dept: int, username: str, phone: str, status: int) -> Select:
"""
获取用户列表查询条件

Expand Down
4 changes: 2 additions & 2 deletions backend/app/generator/crud/crud_gen_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async def get_all_by_business(self, db: AsyncSession, business_id: int) -> Seque
"""
return await self.select_models_order(db, sort_columns='sort', gen_business_id=business_id)

async def create(self, db: AsyncSession, obj: CreateGenModelParam, pd_type: str | None = None) -> None:
async def create(self, db: AsyncSession, obj: CreateGenModelParam, pd_type: str | None) -> None:
"""
创建代码生成模型

Expand All @@ -43,7 +43,7 @@ async def create(self, db: AsyncSession, obj: CreateGenModelParam, pd_type: str
"""
await self.create_model(db, obj, pd_type=pd_type)

async def update(self, db: AsyncSession, pk: int, obj: UpdateGenModelParam, pd_type: str | None = None) -> int:
async def update(self, db: AsyncSession, pk: int, obj: UpdateGenModelParam, pd_type: str | None) -> int:
"""
更新代码生成模型

Expand Down
4 changes: 3 additions & 1 deletion backend/common/response/response_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ class ResponseBase:

@staticmethod
def __response(
*, res: CustomResponseCode | CustomResponse = None, data: Any | None = None
*,
res: CustomResponseCode | CustomResponse,
data: Any | None,
) -> ResponseModel | ResponseSchemaModel:
"""
请求返回通用方法
Expand Down
2 changes: 1 addition & 1 deletion backend/plugin/casbin/service/casbin_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async def get_casbin_list(*, ptype: str, sub: str) -> Select:
return await casbin_dao.get_list(ptype, sub)

@staticmethod
async def get_policy_list(*, role: int | None = None) -> list:
async def get_policy_list(*, role: int | None) -> list:
"""
获取 P 策略列表

Expand Down
2 changes: 1 addition & 1 deletion backend/plugin/config/crud/crud_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ async def get_by_key(self, db: AsyncSession, key: str) -> Config | None:
"""
return await self.select_model_by_column(db, key=key)

async def get_list(self, name: str | None = None, type: str | None = None) -> Select:
async def get_list(self, name: str | None, type: str | None) -> Select:
"""
获取参数配置列表

Expand Down
2 changes: 1 addition & 1 deletion backend/plugin/config/service/config_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async def get(pk: int) -> Config:
return config

@staticmethod
async def get_select(*, name: str | None = None, type: str | None = None) -> Select:
async def get_select(*, name: str | None, type: str | None) -> Select:
"""
获取参数配置列表查询条件

Expand Down
2 changes: 1 addition & 1 deletion backend/plugin/dict/crud/crud_dict_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async def get(self, db: AsyncSession, pk: int) -> DictData | None:
"""
return await self.select_model(db, pk)

async def get_list(self, label: str | None = None, value: str | None = None, status: int | None = None) -> Select:
async def get_list(self, label: str | None, value: str | None, status: int | None) -> Select:
"""
获取字典数据列表

Expand Down
2 changes: 1 addition & 1 deletion backend/plugin/dict/crud/crud_dict_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async def get(self, db: AsyncSession, pk: int) -> DictType | None:
"""
return await self.select_model(db, pk)

async def get_list(self, *, name: str | None = None, code: str | None = None, status: int | None = None) -> Select:
async def get_list(self, *, name: str | None, code: str | None, status: int | None) -> Select:
"""
获取字典类型列表

Expand Down
2 changes: 1 addition & 1 deletion backend/plugin/dict/service/dict_data_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async def get(*, pk: int) -> DictData:
return dict_data

@staticmethod
async def get_select(*, label: str | None = None, value: str | None = None, status: int | None = None) -> Select:
async def get_select(*, label: str | None, value: str | None, status: int | None) -> Select:
"""
获取字典数据列表查询条件

Expand Down
2 changes: 1 addition & 1 deletion backend/plugin/dict/service/dict_type_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class DictTypeService:
"""字典类型服务类"""

@staticmethod
async def get_select(*, name: str | None = None, code: str | None = None, status: int | None = None) -> Select:
async def get_select(*, name: str | None, code: str | None, status: int | None) -> Select:
"""
获取字典类型列表查询条件

Expand Down
6 changes: 3 additions & 3 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.