From bf4f98acd8f9d6b2206905736953918ae7b83722 Mon Sep 17 00:00:00 2001
From: xjh <2423579486@qq.com>
Date: Wed, 19 Apr 2023 16:33:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BD=9C=E5=93=81=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Works/WorksType.php | 27 +++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/admin/controller/Works/WorksType.php b/app/admin/controller/Works/WorksType.php
index d8a5d63..60bcd0c 100644
--- a/app/admin/controller/Works/WorksType.php
+++ b/app/admin/controller/Works/WorksType.php
@@ -27,14 +27,19 @@ class WorksType extends BaseController
      * @author xjh
      * @since 1.0.0
      */
-    public function getWorksTypeList(Request $request): array
+    public function getWorksTypeList(Request $request):array
     {
-        $con = Tool::getOptionalQuery(
-            ['b.works_type_delete_time', 'NULL'],
-            ['a.works_type_name', 'LIKE']
-        );
+        $con = Tool::getOptionalQuery(['works_type_name', 'LIKE']);
+        $con[] = ['works_type_parent_guid', '=', "0"];
+        $works_type_guids  = self::pageWrapper(ModelWorksType::where($con))
+            ->order('works_type_order')
+            ->column('works_type_guid');
 
-        $works_type  = ModelWorksType::where($con)
+        $works_type  = ModelWorksType::whereOr([
+            [["a.works_type_guid", 'in', $works_type_guids]],
+            [["a.works_type_ancestors_guid", 'REGEXP', implode('|', $works_type_guids)]],
+        ])
+            ->where([['b.works_type_delete_time', 'NULL', null]])
             ->field([
                 'a.works_type_id',
                 'a.works_type_guid',
@@ -43,8 +48,7 @@ class WorksType extends BaseController
                 'a.works_type_parent_guid',
                 'a.works_type_ancestors_guid',
                 'b.works_type_name' => "works_type_parent_name",
-            ])
-            ->alias('a')
+            ])->alias('a')
             ->leftjoin('works_type b', 'a.works_type_parent_guid = b.works_type_guid')
             ->order('works_type_order')
             ->select()
@@ -62,7 +66,10 @@ class WorksType extends BaseController
             ];
         });
 
-        return msg("获取作品类型列表成功!", $works_type_tree);
+        return msg(0, "获取作品类型列表成功!", [
+            'data' => $works_type_tree,
+            'count' => ModelWorksType::where('works_type_parent_guid', '0')->count()
+        ]);
     }
 
     /**
@@ -179,7 +186,7 @@ class WorksType extends BaseController
      * @author xjh
      * @since 1.0.0
      */
-    public function exportExcel(Request $request):void
+    public function exportExcel(Request $request): void
     {
         $params = $request->param();
         $con = [];