From b2a5cf3f47b86ec6b69053dfb2a12d02e3980720 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 31 十二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/role.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/app/service/role.py b/app/service/role.py
index 7739d00..ecc8c4a 100644
--- a/app/service/role.py
+++ b/app/service/role.py
@@ -1,6 +1,8 @@
import uuid
from Log import logger
+from app.config.const import DEPT_STATUS_ON
+from app.models import OrganizationModel
from app.models.resource_model import ResourceModel
from app.models.role_model import RoleModel
@@ -8,13 +10,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)))
- roles = query.order_by(RoleModel.id.desc()).limit(page_size).offset(
+ total = query.count()
+ roles = query.order_by(RoleModel.created_at.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 if role.status == DEPT_STATUS_ON]}
async def create_role(db, role_name: str, description: str, role_key, data_scope, user_id):
@@ -53,7 +56,7 @@
return True
-async def edit_role_resource(db, role_id:str, role_name:str, description:str,role_key:str, data_scope:int, resources:list, edit_type:int):
+async def edit_role_resource(db, role_id:str, role_name:str, description:str,role_key:str, data_scope:int, resources:list, edit_type:int, depts:list):
try:
role = db.query(RoleModel).filter(RoleModel.id == role_id).first()
if edit_type == 1:
@@ -64,8 +67,10 @@
role.roleKey = role_key
if data_scope:
role.dataScope = data_scope
- else:
+ elif edit_type == 2:
role.resources = [db.get(ResourceModel, resourcesId) for resourcesId in resources]
+ elif edit_type == 3:
+ role.organizations = [db.get(OrganizationModel, deptId) for deptId in depts]
db.add(role)
db.commit()
except Exception as e:
--
Gitblit v1.8.0