From 2f84e3cc4bff981590ab37bd95da64bd72c1f2e0 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 16 十二月 2024 09:40:00 +0800
Subject: [PATCH] 12-16
---
app/service/role.py | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/service/role.py b/app/service/role.py
index a0c631f..bc3e1af 100644
--- a/app/service/role.py
+++ b/app/service/role.py
@@ -8,18 +8,19 @@
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):
try:
- role_model = RoleModel(id=str(uuid.uuid4()),name=role_name, description=description,creator=user_id, data_scope=data_scope)
+ role_model = RoleModel(id=str(uuid.uuid4()),name=role_name, description=description,creator=user_id, dataScope=data_scope)
if role_key:
role_model.roleKey = role_key
db.add(role_model)
@@ -63,7 +64,7 @@
if role_key:
role.roleKey = role_key
if data_scope:
- role.data_scope = data_scope
+ role.dataScope = data_scope
else:
role.resources = [db.get(ResourceModel, resourcesId) for resourcesId in resources]
db.add(role)
--
Gitblit v1.8.0