From 4384a3000c4cbc07c3f159ba455ef1d63e558d83 Mon Sep 17 00:00:00 2001 From: waizking Date: Mon, 21 Mar 2022 03:15:25 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=A6=E5=8F=B7=E5=A4=9A?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=97=B6=E8=8F=9C=E5=8D=95=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E5=AD=90=E8=8F=9C=E5=8D=95ID=E5=B0=8F=E4=BA=8E?= =?UTF-8?q?=E7=88=B6=E8=8F=9C=E5=8D=95ID=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/common/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/common/admin.py b/applications/common/admin.py index 47c8b63..8bc0c67 100644 --- a/applications/common/admin.py +++ b/applications/common/admin.py @@ -36,12 +36,12 @@ def make_menu_tree(): if p.enable == 0: continue # 一二级菜单 - if int(p.type) == 0 or int(p.type) == 1: + if int(p.type) in [0,1] and p not in powers: powers.append(p) power_schema = PowerOutSchema(many=True) # 用已继承 ma.ModelSchema 类的自定制类生成序列化类 power_dict = power_schema.dump(powers) # 生成可序列化对象 - power_dict.sort(key=lambda x: x['id'], reverse=True) + power_dict.sort(key=lambda x: (x['parent_id'], x['id']), reverse=True) menu_dict = OrderedDict() for _dict in power_dict: -- Gitee