Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

zhaoqingang

2025-01-10 2ed768cc0b06da368d7d90e5bcf95583e73280ea

Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

 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():

 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: