241225-1代码。

routers/prod_api/system/area/__init__.py

@@ -31,8 +31,8 @@ def read_all_areas(parent_id:int = 1,db: Session = Depends(get_db)):
             data.append({'id': area_info.id,
                          'label': f"{area_info.area_name}本级",
                          'personSum': 0,
-                         'isShowSelect': False,
-                         # 'parentLabel': area_info.area_name
+                         'isShowSelect': True,
+                         'parentLabel': area_info.area_name
                          })
         for info in area_list:
             isShowSelect = True
@@ -48,6 +48,40 @@ def read_all_areas(parent_id:int = 1,db: Session = Depends(get_db)):
                 "msg": "成功",
                 "data": data
         }
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+
+@router.get("/tree2/{parent_id}")
+def read_all_areas(parent_id:int = 1,db: Session = Depends(get_db)):
+    def parent_id_get_area_info(parent_id):
+        query = db.query(GovdataArea)
+        query = query.filter(GovdataArea.parent_id == parent_id)
+        return query.all()
+    def id_get_area_info(id):
+        query = db.query(GovdataArea)
+        query = query.filter(GovdataArea.id == id)
+        return query.first()
+    try:
+        area_info = id_get_area_info(parent_id)
+        area_list = parent_id_get_area_info(parent_id)
+        data = []
+
+        for info in area_list:
+            isShowSelect = True
+            if parent_id_get_area_info(info.id):
+                isShowSelect=False
+            data.append({'id': info.id,
+                'label': info.area_name,
+                'personSum': 0,
+                'isShowSelect': isShowSelect,
+                'parentLabel': area_info.area_name})
+        return {
+                "code": 200,
+                "msg": "成功",
+                "data": data
+        }
     except Exception as e:
         traceback.print_exc()
         raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")