增加功能

zhaoqingang

2024-11-13 de45d8dc19cd16b85344a3c3bbb243a12e8811a0

 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):
async def get_user_list(db, page_size: int, page_index: int, keyword: str, role_key:str, user_id):
    query = db.query(UserModel)
    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)