From 41d968b369d3a4b81d8444d5ce1ff0ec256f3157 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 10 Feb 2026 15:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E8=BF=98=E8=AE=B0=E5=BD=95=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvRequisitionItemReturnService.php        | 18 +++++++++---------
 .../service/InvRequisitionReturnService.php    |  7 ++++++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/common/service/InvRequisitionItemReturnService.php b/app/common/service/InvRequisitionItemReturnService.php
index 5c15c74..8353c0e 100644
--- a/app/common/service/InvRequisitionItemReturnService.php
+++ b/app/common/service/InvRequisitionItemReturnService.php
@@ -553,15 +553,15 @@ class InvRequisitionItemReturnService
                 $config['where']['id'] = $p['requisition_item_return_id'];
                 break;
             case 'index':
-                if(isset($p['status'])){
-                    $config['where']['status'] = $p['status'];
-                }
-                if(isset($p['handler_id']) && $p['handler_id']=='self'){
-                    $config['where']['applicant_id'] = $request->user->uid;
-                }else{
-                    $config['where']['handler_id'] = $request->user->uid;
-                }
-                $config['order']['id'] = 'desc';
+//                if(isset($p['status']) && $p['status']!=''){
+//                    $config['where']['status'] = $p['status'];
+//                }
+//                if(isset($p['handler_id']) && $p['handler_id']=='self'){
+//                    $config['where']['applicant_id'] = $request->user->uid;
+//                }else{
+//                    $config['where']['handler_id'] = $request->user->uid;
+//                }
+//                $config['order']['id'] = 'desc';
                 break;
             case 'show':
                 $config['where']['id'] = $p['id'];
diff --git a/app/common/service/InvRequisitionReturnService.php b/app/common/service/InvRequisitionReturnService.php
index eef5322..b9015d4 100644
--- a/app/common/service/InvRequisitionReturnService.php
+++ b/app/common/service/InvRequisitionReturnService.php
@@ -65,9 +65,14 @@ class InvRequisitionReturnService
                 $config['where']['id'] = $p['requisition_item_return_id'];
                 break;
             case 'index':
-                if(isset($p['status'])){
+                if(isset($p['status']) && $p['status']!=''){
                     $config['where']['status'] = $p['status'];
                 }
+                if (isset($p['handler_id']) && $p['handler_id'] == 'self') {
+                    $config['where']['applicant_id'] = $request->user->uid;
+                } else {
+                    $config['where']['handler_id'] = $request->user->uid;
+                }
                 $config['order']['id'] = 'desc';
                 break;
             case 'show':