From 536a8bbbe42c527ef9eaee9a8a8d2ee3615f5a11 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 14 一月 2025 16:19:04 +0800
Subject: [PATCH] 文档智能过程信息显示
---
app/service/user.py | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index fbc4119..00162c0 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -1,4 +1,5 @@
import time
+import uuid
from datetime import datetime
from traceback import print_tb
@@ -84,10 +85,10 @@
# 瀛樺偍鐢ㄦ埛淇℃伅
hashed_password = pwd_context.hash(password)
-
+ sync_flag = str(uuid.uuid4())
user_model = UserModel(username=user_name, hashed_password=hashed_password, email=email,
## ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"),
- phone=phone, login_name=login_name)
+ phone=phone, login_name=login_name,sync_flag=sync_flag)
pwd = user_model.encrypted_password(app_password)
user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
user_model.password = pwd
@@ -104,8 +105,8 @@
except Exception as e:
logger.error(e)
# db.rollback()
- return False
- return True
+ return ''
+ return sync_flag
async def edit_user_data(db, user_id, email, phone, login_name, roles, groups):
@@ -331,8 +332,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:
@@ -340,20 +341,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
@@ -384,7 +384,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