From c0d11dac469251c71b036c757c788615285c9683 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 十一月 2024 10:57:10 +0800
Subject: [PATCH] 毕昇对话历史只返回了一条修正，按时间正序排列吧，json乱码修正
---
app/service/user.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 061d9b9..e2d8467 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -1,18 +1,18 @@
-import base64
-
from datetime import datetime
from app.api import pwd_context
from app.config.config import settings
from app.models import RoleModel, GroupModel
from app.models.user_model import UserModel
-from app.Log import logger
+from Log import logger
from app.service.bisheng import BishengService
from app.service.ragflow import RagflowService
-async def get_user_list(db, page_size: int, page_index: int, keyword: str):
- query = db.query(UserModel)
+async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key:str, user_id):
+ query = db.query(UserModel).filter(UserModel.permission!="admin")
+ # if role_key != "admin":
+ # query.filter(UserModel.creator==user_id)
if keyword:
query = query.filter(UserModel.group_name.like('%{}%'.format(keyword)))
users = query.order_by(UserModel.id.desc()).limit(page_size).offset(
@@ -42,7 +42,7 @@
return True
-async def create_user(db, user_name, email, phone, login_name, password, roles, groups):
+async def create_user(db, user_name, email, phone, login_name, password, roles, groups, user_id):
try:
bisheng_service = BishengService(settings.sgb_base_url)
ragflow_service = RagflowService(settings.fwr_base_url)
@@ -69,6 +69,7 @@
user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
if groups:
user_model.groups = [db.get(GroupModel, groupId) for groupId in groups]
+ user_model.creator = user_id
db.add(user_model)
db.commit()
db.refresh(user_model)
--
Gitblit v1.8.0