From f21bffe8c2d6d58e15b416f93ed0edbe4078f38c Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期二, 25 二月 2025 15:41:12 +0800 Subject: [PATCH] 优化 --- app/models/user_model.py | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/models/user_model.py b/app/models/user_model.py index dcbb612..7c4917e 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 @@ -188,7 +189,7 @@ def encrypted_password(self, password): - return cipher_suite.encrypt(password.encode("utf-8")).decode("utf-8") + return cipher_suite.encrypt(str(password).encode("utf-8")).decode("utf-8") def decrypted_password(self): return cipher_suite.decrypt(self.password).decode("utf-8") -- Gitblit v1.8.0