From b24fbbcb8b42d147fa81b22275e57b5844a1fdc8 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 25 十二月 2024 09:43:54 +0800
Subject: [PATCH] 问题优化
---
app/models/user_model.py | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/app/models/user_model.py b/app/models/user_model.py
index dcbb612..b76cdc8 100644
--- a/app/models/user_model.py
+++ b/app/models/user_model.py
@@ -112,25 +112,26 @@
# if len(self.roles) > 0:
roles = {role.id: role.to_dict() for role in self.roles}
- ogt_set = set()
- for ogt in self.organizations:
- if ogt.id in ogt_set:
- continue
- print(ogt.id)
- ogt_set.add(ogt.id)
- for role in ogt.roles:
- roles[role.id] = role.to_dict()
- parent_ogt = ogt.parent
- while parent_ogt:
- if parent_ogt.id not in ogt_set:
- ogt_set.add(ogt.id)
- for role in parent_ogt.roles:
- roles[role.id] = role.to_dict()
- parent_ogt = parent_ogt.parent
- else:
- break
+ # ogt_set = set()
+ # for ogt in self.organizations:
+ # if ogt.id in ogt_set:
+ # continue
+ # print(ogt.id)
+ # ogt_set.add(ogt.id)
+ # for role in ogt.roles:
+ # roles[role.id] = role.to_dict()
+ # parent_ogt = ogt.parent
+ # while parent_ogt:
+ # if parent_ogt.id not in ogt_set:
+ # ogt_set.add(ogt.id)
+ # for role in parent_ogt.roles:
+ # roles[role.id] = role.to_dict()
+ # parent_ogt = parent_ogt.parent
+ # else:
+ # break
json['roles'] = list(roles.values())
+ json['depts'] = [i.to_base_json() for i in self.organizations]
return json
--
Gitblit v1.8.0