From fd734ab75a0856eddf803352367a7c61a1cf406b Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期五, 10 一月 2025 13:33:54 +0800
Subject: [PATCH] 用户组成员管理排除删除掉的用户，修改excel下载文件名
---
app/service/group.py | 5 ++++-
app/api/excel.py | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index b34c183..2c2fedd 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -155,7 +155,7 @@
return JSONResponse(content={"error": "鏂囦欢涓嶅瓨鍦�"}, status_code=404)
return FileResponse(
path=file_path,
- filename=file_name,
+ filename="Excel.xlsx",
media_type='application/octet-stream',
)
# def delete_file():
diff --git a/app/service/group.py b/app/service/group.py
index 474084b..c65dbd8 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -7,6 +7,7 @@
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token
from Log import logger
+from sqlalchemy import and_
async def group_list(db, page_size: int, page_index: int, keyword: str):
@@ -61,7 +62,9 @@
not_group_user = []
in_group_user = []
user_list = [u.id for u in db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).first().users]
- for u in db.query(UserModel.id, UserModel.username,UserModel.permission).filter(UserModel.permission!="admin").order_by(UserModel.id.desc()).all():
+ for u in db.query(UserModel.id, UserModel.username, UserModel.permission).filter(
+ and_(UserModel.permission != "admin", UserModel.status != 2)
+ ).order_by(UserModel.id.desc()).all():
if u.id in user_list:
in_group_user.append({"userId": u.id, "userName": u.username})
else:
--
Gitblit v1.8.0