From b9c7727dc6fbb3789f063c0616ef9392311fecb2 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 二月 2025 10:58:14 +0800
Subject: [PATCH] merge master
---
app/service/user.py | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index b6c916e..3536b89 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -337,8 +337,8 @@
knowledge_dict = {}
user = db.query(UserModel).filter_by(id=user_id).first()
parent_id = ""
- # print(111111111111111)
- async def role_resource(role_set, permissions, roles):
+
+ async def role_resource_type(role_set, permissions, roles, type):
nonlocal parent_id
for role in roles:
if role.id not in role_set:
@@ -346,20 +346,19 @@
for r in role.resources:
if r.resource_type_id != "1":
- # if not r.resource_id:
- # parent_id = r.id
- # continue
- permissions[r.id] = r.to_router_dict()
+ permission_dict = r.to_router_dict()
+ permission_dict["type"] = type
+ permissions[r.id] = permission_dict
- await role_resource(role_set, permissions, user.roles)
+ await role_resource_type(role_set, permissions, user.roles, "user")
for ogt in user.organizations:
if ogt.roles:
- await role_resource(role_set, permissions, ogt.roles)
+ await role_resource_type(role_set, permissions, ogt.roles, "org")
parent_ogt = ogt.parent
while parent_ogt:
if parent_ogt.id not in dept_set:
- await role_resource(role_set, permissions, parent_ogt.roles)
+ await role_resource_type(role_set, permissions, parent_ogt.roles, "org")
dept_set.add(parent_ogt.id)
parent_ogt = parent_ogt.parent
@@ -390,7 +389,7 @@
async def get_user_dept(db, user_id):
res = {}
user = db.query(UserModel).filter_by(id=user_id).first()
- res["rows"] = [i.to_dict() for i in user.organizations]
+ res["rows"] = [i.to_dict() for i in user.organizations if i.status == DEPT_STATUS_ON]
return res
--
Gitblit v1.8.0