From 88360b4ac6f051f62a91e93d602fd393935071ab Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 16 十二月 2024 17:26:11 +0800
Subject: [PATCH] sync data

---
 app/service/role.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/service/role.py b/app/service/role.py
index 7739d00..bc3e1af 100644
--- a/app/service/role.py
+++ b/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):

--
Gitblit v1.8.0