From 90c9a1fcd8ea61590c7cd200999afed310ff5327 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 25 May 2024 17:30:11 +0800
Subject: [PATCH] update

---
 .../controller/works/bgsp/OaFlowTypeController.php    |  5 +++++
 app/adminapi/lists/works/bgsp/OaFlowLists.php         |  2 +-
 app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php     | 11 +++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/controller/works/bgsp/OaFlowTypeController.php b/app/adminapi/controller/works/bgsp/OaFlowTypeController.php
index 4421c1421..9211da51e 100644
--- a/app/adminapi/controller/works/bgsp/OaFlowTypeController.php
+++ b/app/adminapi/controller/works/bgsp/OaFlowTypeController.php
@@ -106,6 +106,11 @@ class OaFlowTypeController extends BaseAdminController
         $result = OaFlowTypeLogic::detail($params);
         return $this->data($result);
     }
+	
+	public function all(){
+		$result = OaFlowTypeLogic::all();
+		return $this->data($result);
+	}
 
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/works/bgsp/OaFlowLists.php b/app/adminapi/lists/works/bgsp/OaFlowLists.php
index b0da32d25..bc27484af 100644
--- a/app/adminapi/lists/works/bgsp/OaFlowLists.php
+++ b/app/adminapi/lists/works/bgsp/OaFlowLists.php
@@ -41,7 +41,7 @@ class OaFlowLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['check_type', 'type'],
+            '=' => ['check_type', 'type','flow_cate'],
             '%like%' => ['name'],
         ];
     }
diff --git a/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php b/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php
index f6a32625e..04d645acf 100644
--- a/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php
+++ b/app/adminapi/logic/works/bgsp/OaFlowTypeLogic.php
@@ -16,6 +16,7 @@ namespace app\adminapi\logic\works\bgsp;
 
 
 use app\common\model\dept\Dept;
+use app\common\model\dict\DictData;
 use app\common\model\works\bgsp\OaFlow;
 use app\common\model\works\bgsp\OaFlowType;
 use app\common\logic\BaseLogic;
@@ -137,4 +138,14 @@ class OaFlowTypeLogic extends BaseLogic
 		$data['data'] = !empty($data['data']) ? json_decode($data['data'],true) : [];
         return $data->toArray();
     }
+	
+	public static function all(): array
+	{
+		$data = DictData::field('name,value')->where('type_value', 'oa_approve_cate')->select()->each(function($data){
+			$data['children'] = OaFlowType::field('id,title,data')->where('type',$data['value'])->select()->each(function($item){
+				$item['data'] = !empty($item['data']) ? json_decode($item['data'],true) : [];
+			})->toArray();
+		})->toArray();
+		return $data;
+	}
 }
\ No newline at end of file