From 49832ca702eb7d59d0132123f3efba87fb3f3e61 Mon Sep 17 00:00:00 2001 From: isummer Date: Tue, 12 Jul 2022 17:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E9=BB=98=E8=AE=A4=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fir_ser/api/utils/modelutils.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fir_ser/api/utils/modelutils.py b/fir_ser/api/utils/modelutils.py index 0dd3d4f..5974320 100644 --- a/fir_ser/api/utils/modelutils.py +++ b/fir_ser/api/utils/modelutils.py @@ -91,11 +91,14 @@ def get_app_download_uri(request, user_obj, app_obj=None, preview=True): def get_min_default_domain_cname_obj(is_system=True): - domain_queryset = DomainCnameInfo.objects.annotate(Count('userdomaininfo')).filter(is_enable=True, - is_system=is_system) + if is_system: + c_n = 'userinfo' + else: + c_n = 'userdomaininfo' + domain_queryset = DomainCnameInfo.objects.annotate(Count(c_n)).filter(is_enable=True, is_system=is_system) if not domain_queryset: return DomainCnameInfo.objects.filter(is_enable=True, is_system=True).first() - return min(domain_queryset, key=lambda x: x.userdomaininfo__count) + return min(domain_queryset, key=lambda x: getattr(x, f'{c_n}__count')) def get_filename_form_file(filename):