From 9ea07e00fc8b92e9b75849859c1ecce77c7096d1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 10 四月 2025 13:31:23 +0800
Subject: [PATCH] 优化
---
app/models/role_model.py | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/models/role_model.py b/app/models/role_model.py
index 22f73c5..3d4dbda 100644
--- a/app/models/role_model.py
+++ b/app/models/role_model.py
@@ -5,6 +5,7 @@
from sqlalchemy import Column, Integer, String, DateTime, Table, ForeignKey
from sqlalchemy.orm import relationship, backref
+from app.config.const import RESOURCE_STATUS_DELETE, DEPT_STATUS_DELETE
from app.models.base_model import Base
# 瑙掕壊璧勬簮鍏宠仈琛�
@@ -25,7 +26,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 +59,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 resource.status != DEPT_STATUS_DELETE]
- if hasattr(self, 'flag'):
- json['flag'] = self.flag
+ json['dept'] = [dept.to_base_json() for dept in self.organizations if dept.status != RESOURCE_STATUS_DELETE]
return json
@@ -102,3 +102,4 @@
roleKey: Optional[str] = ""
dataScope: Optional[int] = 0
editType: int
+ depts: Optional[list] = []
--
Gitblit v1.8.0