From a1e8b5465845393c013cb2d3ae12cbecc5c4efd8 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 26 二月 2025 13:51:20 +0800
Subject: [PATCH] 用户增加修改组信息
---
app/service/user.py | 32 +-------------------------------
1 files changed, 1 insertions(+), 31 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index d11683e..7a63ff8 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -106,8 +106,6 @@
async def edit_user_data(db, user_id, email, phone, login_name, roles, groups):
try:
- print(121221)
- print(roles)
user = db.query(UserModel).filter(UserModel.id == user_id).first()
user.email = email
user.phone = phone
@@ -115,9 +113,8 @@
user.email = email
user.updated_at = datetime.now()
user.roles = [db.get(RoleModel, roleId) for roleId in roles]
- # user.groups = [db.get(GroupModel, groupId) for groupId in groups]
+ user.groups = [db.get(GroupModel, groupId) for groupId in groups]
db.commit()
- print(4343)
except Exception as e:
logger.error(e)
db.rollback()
@@ -128,20 +125,7 @@
async def edit_user_pwd(db, user_id, current_user_id, new_password="basic123456"):
try:
user = db.query(UserModel).filter(UserModel.id == user_id).first()
- # pwd = user.decrypted_password()
- # for app in AppRegisterDao(db).get_apps():
- # if app.get("id") == RAGFLOW:
- # token = await get_new_token(db, user_id, app.get("id"))
- # ragflow_service = RagflowService(settings.fwr_base_url)
- # await ragflow_service.set_user_password(token, pwd, new_password)
- # elif app.get("id") == BISHENG:
- # token = await get_bisheng_token(db, current_user_id)
- # bisheng_service = BishengService(settings.sgb_base_url)
- # await bisheng_service.change_password_public(token, user.username, pwd, new_password)
- # else:
- # logger.error("娉ㄥ唽鏈煡搴旂敤锛歿}".format(app.get("id")))
user.hashed_password = pwd_context.hash(new_password)
- # user.password = user.encrypted_password(new_password)
db.commit()
except Exception as e:
logger.error(e)
@@ -227,12 +211,9 @@
await role_resource(role_set, permissions, user.roles)
for ogt in user.organizations:
- print(ogt.name)
if ogt.status != DEPT_STATUS_ON:
continue
- print(ogt.name)
if ogt.roles:
- print(9877)
await role_resource(role_set, permissions,ogt.roles)
parent_ogt = ogt.parent
while parent_ogt:
@@ -244,8 +225,6 @@
break
# print(permissions.keys())
def get_parent(parent, permissions):
- # print(parent.id)
- # nonlocal permissions
if parent.id not in permissions:
permissions[parent.id] = parent # .to_router_dict()
@@ -354,15 +333,6 @@
parent_ogt = parent_ogt.parent
else:
break
-
- # tmp_dit = {}
- # for permission in permissions.values():
- # tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) + [permission]
- #
- # def get_child(parent_id):
- # res = permissions[parent_id]
- # res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
- # return res
# res["menus"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
res["menus"] = list(permissions.values())
--
Gitblit v1.8.0