From de45d8dc19cd16b85344a3c3bbb243a12e8811a0 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 13 十一月 2024 15:16:59 +0800
Subject: [PATCH] 增加功能
---
app/service/group.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/service/group.py b/app/service/group.py
index 7519f65..903aa76 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -1,16 +1,16 @@
-from sqlalchemy.testing.pickleable import Order
-
from app.config.config import settings
from app.models.group_model import GroupModel
from app.models.user_model import UserModel
from app.service.ragflow import RagflowService
from app.service.token import get_ragflow_token
-from app.Log import logger
+from Log import logger
-async def group_list(db, page_size: int, page_index: int, keyword: str):
+async def group_list(db, page_size: int, page_index: int, keyword: str, role_key:str, user_id):
logger.info("-------------------------group_list----------------------------------")
query = db.query(GroupModel)
+ if role_key != "admin":
+ query.filter(GroupModel.creator==user_id)
if keyword:
query = query.filter(GroupModel.group_name.like('%{}%'.format(keyword)))
items = query.order_by(GroupModel.id.desc()).limit(page_size).offset(
@@ -30,9 +30,9 @@
return {"total": query.count(), "items": [item.to_json() for item in items]}
-async def create_group(db, group_name: str, group_description: str):
+async def create_group(db, group_name: str, group_description: str, user_id):
try:
- group_model = GroupModel(group_name=group_name, group_description=group_description)
+ group_model = GroupModel(group_name=group_name, group_description=group_description, creator=user_id)
db.add(group_model)
db.commit()
db.refresh(group_model)
--
Gitblit v1.8.0