From c941b948f1fa8eff615985a83110a401ae426ab3 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 18 十二月 2024 11:03:49 +0800
Subject: [PATCH] 知识库和智能体同步
---
app/models/role_model.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/models/role_model.py b/app/models/role_model.py
index 74d79dd..42895df 100644
--- a/app/models/role_model.py
+++ b/app/models/role_model.py
@@ -25,7 +25,7 @@
seq = Column(Integer)
roleKey = Column(String(100))
dataScope = Column(Integer)
- status = Column(String(10), default="0")
+ status = Column(String(10), default="1")
creator = Column(Integer)
role_type = Column(Integer, default=1)
@@ -58,11 +58,10 @@
'dataScope': self.dataScope
}
- if len(self.resources) > 0:
- json['resources'] = [resource.to_json() for resource in self.resources]
+ # if len(self.resources) > 0:
+ json['resources'] = [resource.to_json() for resource in self.resources]
- if hasattr(self, 'flag'):
- json['flag'] = self.flag
+ json['dept'] = [dept.to_base_json() for dept in self.organizations]
return json
@@ -90,15 +89,16 @@
class RoleStatus(BaseModel):
- role_id: str
+ roleId: str
status: constr(min_length=1, max_length=1, pattern='^(0|1)$')
class RoleEdit(BaseModel):
- role_id: str
+ roleId: str
remark: Optional[str] = ""
roleName: Optional[str] = ""
resources: Optional[list] = []
roleKey: Optional[str] = ""
dataScope: Optional[int] = 0
editType: int
+ depts: Optional[list] = []
--
Gitblit v1.8.0