From 3f6b4007979dc56d266e3202f28a741d93300b31 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 13 十一月 2024 19:28:33 +0800
Subject: [PATCH] 参数修改
---
app/models/user_model.py | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/app/models/user_model.py b/app/models/user_model.py
index d722d02..96d2d32 100644
--- a/app/models/user_model.py
+++ b/app/models/user_model.py
@@ -127,35 +127,31 @@
# 'phoneNumber': self.phone_number
}
parent_dict = {}
- resources = []
+ children_dict = {}
for role in self.roles:
for r in role.to_json().get("resources", []):
- if not r["parentId"]:
- resources.append(r)
- continue
- if r["parentId"] in parent_dict:
- parent_dict[r["parentId"]].append(r)
+ if r["menuType"] != "1":
+ parent_dict[r["menuId"]] = r
else:
- parent_dict[r["parentId"]] = [r]
-
- # roles = [role.to_json() for role in self.roles]
+ if r["parentId"] in children_dict:
+ children_dict[r["parentId"]].append(r)
+ else:
+ children_dict[r["parentId"]] = [r]
organization_roles = [role.to_json() for organization in self.organizations for role in
organization.roles]
for role in organization_roles:
for r in role.to_json().get("resources", []):
- if not r["parentId"]:
- resources.append(r)
- continue
- if r["parentId"] in parent_dict:
- parent_dict[r["parentId"]].append(r)
+ if r["menuType"] != "1":
+ parent_dict[r["menuId"]] = r
else:
- parent_dict[r["parentId"]] = [r]
-
-
- # for resource in resources:
- # if resource["menuId"] in parent_dict:
- # resource[]
-
+ if r["parentId"] in children_dict:
+ children_dict[r["parentId"]].append(r)
+ else:
+ children_dict[r["parentId"]] = [r]
+ resources = []
+ for resource in parent_dict.values():
+ resource["children"] = children_dict.get(resource["menuId"], [])
+ resources.append(resource)
json['resources'] = resources
return json
--
Gitblit v1.8.0