From cbfd2e4074e2c9f0d6635c1d87f0dca20e7943d0 Mon Sep 17 00:00:00 2001 From: ktianc Date: Sun, 16 Oct 2022 22:29:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8D=95=E4=B8=AA=E6=95=B0=E6=8D=AE=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kinit-api/core/crud.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kinit-api/core/crud.py b/kinit-api/core/crud.py index e0af60d..1dd1003 100644 --- a/kinit-api/core/crud.py +++ b/kinit-api/core/crud.py @@ -61,14 +61,15 @@ class DalBase: if key != "order" and key != "return_none" and value and getattr(self.model, key, None): kwargs_exist = True break - data = None if data_id or kwargs_exist or keys_exist: sql = select(self.model).where(self.model.id == data_id) if data_id else select(self.model) sql = self.add_filter_condition(sql, keys, options, **kwargs) - if order and order == "desc": - sql = sql.order_by(self.model.create_datetime.desc()) - queryset = await self.db.execute(sql) - data = queryset.scalars().first() + else: + sql = select(self.model) + if order and order == "desc": + sql = sql.order_by(self.model.create_datetime.desc()) + queryset = await self.db.execute(sql) + data = queryset.scalars().first() if not data and return_none: return None if data and schema: