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 | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/app/models/user_model.py b/app/models/user_model.py index aea4cbd..96d2d32 100644 --- a/app/models/user_model.py +++ b/app/models/user_model.py @@ -34,6 +34,7 @@ status = Column(String(10), nullable=False, default="1") creator = Column(String(36)) sex = Column(String(1)) + permission = Column(String(16), nullable=False, default="1") age = Column(Integer) created_at = Column(DateTime, default=datetime.now()) updated_at = Column(DateTime, default=datetime.now(), onupdate=datetime.now()) @@ -111,6 +112,49 @@ json['roles'] = roles return json + def to_login_json(self): + json = { + 'userId': self.id, + 'createTime': self.created_at.strftime('%Y-%m-%d %H:%M:%S') if self.created_at else "", + 'updateTime': self.updated_at.strftime('%Y-%m-%d %H:%M:%S') if self.created_at else "", + 'userName': self.username, + 'loginName': self.login_name, + 'sex': self.sex, + 'age': self.age, + "status": self.status, + 'phone': self.phone, + 'email': self.email, + # 'phoneNumber': self.phone_number + } + parent_dict = {} + children_dict = {} + for role in self.roles: + for r in role.to_json().get("resources", []): + if r["menuType"] != "1": + parent_dict[r["menuId"]] = r + else: + 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 r["menuType"] != "1": + parent_dict[r["menuId"]] = r + else: + 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 + def get_children(self): """閫掑綊鑾峰彇鎸囧畾鐢ㄦ埛鐨勫瓙鐢ㄦ埛ID鍒楄〃""" -- Gitblit v1.8.0