From 20bbed188fd7833d14801dc202fa3cdbb085ca2b Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期五, 20 十二月 2024 11:51:34 +0800
Subject: [PATCH] 优化excel合并脚本

---
 app/models/resource_model.py |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/resource_model.py b/app/models/resource_model.py
index e898e3a..00bd03f 100644
--- a/app/models/resource_model.py
+++ b/app/models/resource_model.py
@@ -25,7 +25,7 @@
     resource_id = Column(String(36), ForeignKey('resource.id'))
     parent = relationship('ResourceModel', remote_side=[id], backref='resources', uselist=False)
     children = relationship('ResourceModel')
-    status = Column(String(10))
+    status = Column(String(10), default="1")
     hidden = Column(Integer, default=0)
     def get_id(self):
         return str(self.ID)
@@ -56,6 +56,8 @@
             'menuId': self.id,
             'menuName': self.name,
             'menuType': self.resource_type_id,
+            'parentId': self.get_pid(),
+            'parentName': self.get_pName(),
             'children': [res.to_tree_select_json() for res in self.children]
         }
 
@@ -180,4 +182,9 @@
     parentId: str
     status: str
     # roles: list
-    # groups: Optional[list] = []
\ No newline at end of file
+    # groups: Optional[list] = []
+
+
+class MenuStatus(BaseModel):
+    menuId: str
+    status: str
\ No newline at end of file

--
Gitblit v1.8.0