From b721860d4aecb12f0613a68e57962c9087ed2ef1 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Wed, 11 Feb 2026 13:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/InvRequisitionService.php | 21 +++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/common/service/InvRequisitionService.php b/app/common/service/InvRequisitionService.php
index a5031c1..3f3ed21 100644
--- a/app/common/service/InvRequisitionService.php
+++ b/app/common/service/InvRequisitionService.php
@@ -61,14 +61,29 @@ class InvRequisitionService
                     $config['where']['applicant_id'] = $p['applicant_id'];
                 } else { //审批人对应的记录
                     $config['where']['approval.approver_id'] = $request->user->uid;
-                    $config['where']['approval.action'] = 0;
+                    //$config['where']['approval.action'] = 0;
                 }
                 if(isset($p['phase']) && $p['phase'] == 'approve'){//借用审批中
-                    $config['where']['status'] = ['in',[10,11,13]];
+                    $config['where']['status'] = ['in',[10,11]];
+                    if(isset($p['scene']) && $p['scene'] == 'approval'){
+                        $config['where']['approval.action'] = 0;
+                    }
                 }elseif(isset($p['phase']) && $p['phase'] == 'repaid'){//已全部归还
                     $config['where']['status'] = 17;
                 }elseif(isset($p['phase']) && $p['phase'] == 'unreturned'){ //未归还
-                    $config['where']['status'] = ['in',[12,14,15,16,18]];
+                    $config['where']['status'] = ['in',[11,12,13,14,15,16,18,19]];
+                }
+                //审核列表
+                elseif(isset($p['phase']) && $p['phase'] == 'pending'){ //待审核
+                    $config['where']['status'] = ['in',[10,11]];
+                    $config['where']['approval.approver_id'] = $request->user->uid;
+                    $config['where']['approval.action'] = 0;
+                }elseif(isset($p['phase']) && $p['phase'] == 'approved'){ //已通过
+                    $config['where']['status'] = ['in',[11,12,14,15,16,17,18,19]];
+                    $config['where']['approval.approver_id'] = $request->user->uid;
+                    $config['where']['approval.action'] = [">",0];
+                }elseif(isset($p['phase']) && $p['phase'] == 'refuse'){ //拒绝,未通过
+                    $config['where']['status'] = ['in',[13]];
                 }
                 $config['order']['id'] = 'desc';
                 break;