12-16

zhaoqingang

2024-12-16 2f84e3cc4bff981590ab37bd95da64bd72c1f2e0

 app/service/role.py

@@ -8,13 +8,14 @@

async def role_list(db, page_size: int, page_index: int, keyword: str, role_key:str, user_id):
    query = db.query(RoleModel)
    if role_key != "admin":
        query.filter(RoleModel.creator==user_id)
    # if role_key != "admin":
    #     query.filter(RoleModel.creator==user_id)
    if keyword:
        query = query.filter(RoleModel.name.like('%{}%'.format(keyword)))
    total = query.count()
    roles = query.order_by(RoleModel.id.desc()).limit(page_size).offset(
        (page_index - 1) * page_size).all()
    return {"total": query.count(), "rows":  [role.to_json() for role in roles]}
    return {"total": total, "rows":  [role.to_json() for role in roles]}


async def create_role(db, role_name: str, description: str, role_key, data_scope, user_id):