From ac9373fd6f0db53c983d87c4790cb627e82759e9 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 25 二月 2025 17:25:39 +0800
Subject: [PATCH] merge
---
app/models/role_model.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/models/role_model.py b/app/models/role_model.py
index 42895df..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
# 瑙掕壊璧勬簮鍏宠仈琛�
@@ -59,9 +60,9 @@
}
# if len(self.resources) > 0:
- json['resources'] = [resource.to_json() for resource in self.resources]
+ json['resources'] = [resource.to_json() for resource in self.resources if resource.status != DEPT_STATUS_DELETE]
- json['dept'] = [dept.to_base_json() for dept in self.organizations]
+ json['dept'] = [dept.to_base_json() for dept in self.organizations if dept.status != RESOURCE_STATUS_DELETE]
return json
--
Gitblit v1.8.0