Skip to content
Merged
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
19 changes: 13 additions & 6 deletions backend/plugin/dict/crud/crud_dict_type.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
from sqlalchemy import Select
from sqlalchemy import Select, and_, desc, select
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import noload
from sqlalchemy_crud_plus import CRUDPlus

from backend.plugin.dict.model import DictType
Expand Down Expand Up @@ -30,14 +31,20 @@ async def get_list(self, *, name: str | None, code: str | None, status: int | No
:param status: 字典状态
:return:
"""
filters = {}
stmt = select(self.model).options(noload(self.model.datas)).order_by(desc(self.model.created_time))

filters = []
if name is not None:
filters.update(name__like=f'%{name}%')
filters.append(self.model.name.like(f'%{name}%'))
if code is not None:
filters.update(code__like=f'%{code}%')
filters.append(self.model.code.like(f'%{code}%'))
if status is not None:
filters.update(status=status)
return await self.select_order('created_time', 'desc', **filters)
filters.append(self.model.status == status)

if filters:
stmt = stmt.where(and_(*filters))

return stmt

async def get_by_code(self, db: AsyncSession, code: str) -> DictType | None:
"""
Expand Down