From 408da97ca74d129aefe4094d50bdd938cf49f693 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Wed, 31 Jan 2024 18:03:50 +0800
Subject: [PATCH] 1

---
 app/adminapi/lists/oa/FlowTypeLists.php   | 2 +-
 app/adminapi/validate/oa/FlowValidate.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/oa/FlowTypeLists.php b/app/adminapi/lists/oa/FlowTypeLists.php
index c48a12660..5303e800b 100644
--- a/app/adminapi/lists/oa/FlowTypeLists.php
+++ b/app/adminapi/lists/oa/FlowTypeLists.php
@@ -40,7 +40,7 @@ class FlowTypeLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['type'],
+            '=' => ['type','status'],
             '%like%' => ['title'],
         ];
     }
diff --git a/app/adminapi/validate/oa/FlowValidate.php b/app/adminapi/validate/oa/FlowValidate.php
index 9db8d7161..45a8e234f 100644
--- a/app/adminapi/validate/oa/FlowValidate.php
+++ b/app/adminapi/validate/oa/FlowValidate.php
@@ -112,6 +112,9 @@ class FlowValidate extends BaseValidate
 		if($data->isEmpty()){
 			return '审批类型信息不存在';
 		}
+		if($data['status'] != 2){
+			return '该审批类型已被禁用';
+		}
 		return true;
 	}