From a879c2bc14dee96c57046d83b08c4e047f3c9b72 Mon Sep 17 00:00:00 2001
From: unknown <https://git-online.zhco.com/reid-zhco/li-questionnaire.git>
Date: Wed, 17 Jul 2024 18:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/ResourceDirController.php | 10 +++++++---
 app/model/ResourceDir.php                | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/controller/ResourceDirController.php b/app/controller/ResourceDirController.php
index 5f0ba46..f1e97d3 100644
--- a/app/controller/ResourceDirController.php
+++ b/app/controller/ResourceDirController.php
@@ -18,10 +18,14 @@ class ResourceDirController
   /**
    * 文件夹 首页
    */
-  public function index()
+  public function index(ResourceDir $resource_dir)
   {
-    echo 123;
-    die;
+    $resource_dir_list =  $resource_dir::where('type', 2)->where('parent_id', 0)->field('id, name')->select()->toArray();
+    //还需要第一个文件夹下所有内容
+    $resource_list = $resource_dir->getResourceDirAndResource($resource_dir_list[0]['id']);
+
+    $ret = ['resource_dir_list' => $resource_dir_list, 'resource_list' => $resource_list];
+    return jsonReturn(0, Lang::get('成功'), $ret);
   }
 
   /**
diff --git a/app/model/ResourceDir.php b/app/model/ResourceDir.php
index e12506e..1dbb548 100644
--- a/app/model/ResourceDir.php
+++ b/app/model/ResourceDir.php
@@ -25,9 +25,22 @@ class ResourceDir extends Model
   }
 
   /**
-   * @param $param 递归获取一个文件夹下所有ids
+   * @param $resource_dir_id 文件夹id
    * @return array
-   * 添加文件夹
+   * 获取一个文件夹下的所有文件夹 和资源
+   */
+  public function getResourceDirAndResource($resource_dir_id)
+  {
+    $resource_list =  Resource::where('parent_id', $resource_dir_id)
+      ->order('type', 'desc') //文件夹放在上面
+      ->order('create_time', 'desc')
+      ->select();
+    return $resource_list;
+  }
+  /**
+   * @param $folderId 文件夹id
+   * @return array
+   * 递归获取一个文件夹下所有ids
    */
   public function getFolderIds($folderId)
   {