From 6000d52dd026aceb7a2fd8d23728d95649b06f72 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 24 十二月 2024 10:54:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/models/resource_model.py | 1 +
app/service/user.py | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/models/resource_model.py b/app/models/resource_model.py
index c819bd9..34f6be1 100644
--- a/app/models/resource_model.py
+++ b/app/models/resource_model.py
@@ -103,6 +103,7 @@
'alwaysShow': True,
'perms': self.perms,
'resourceType': self.get_type_json(),
+ 'seq': self.seq,
'meta': {
'title': self.name,
'icon': self.icon,
diff --git a/app/service/user.py b/app/service/user.py
index 42bb7fd..5b8e013 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -270,8 +270,9 @@
res = permissions[parent_id].to_router_dict()
res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
return res
-
- return {"routers": [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]}
+ select_list = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ sorted_permission_list = sorted(select_list, key=lambda x: x['seq'], reverse=True)
+ return {"routers": sorted_permission_list}
async def get_user_menus(db, user_id):
--
Gitblit v1.8.0