From d719ee5ea21a65dc6199f77eb812104d3f368d3c Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Fri, 6 Feb 2026 15:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/InvRequisitionApproveService.php    | 7 ++-----
 app/common/service/InvRequisitionItemReturnService.php | 7 +++++++
 app/common/service/InvRequisitionService.php           | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/common/service/InvRequisitionApproveService.php b/app/common/service/InvRequisitionApproveService.php
index f80a7cc..6c43906 100644
--- a/app/common/service/InvRequisitionApproveService.php
+++ b/app/common/service/InvRequisitionApproveService.php
@@ -138,12 +138,9 @@ class InvRequisitionApproveService
 //                    return ['status' => 'noop', 'msg' => '非当前审批'];
 //                }
                 return ['status' => 'noop', 'msg' => '无待处理记录'];
+            } else if ($pendingRecord->approver_id != $uid) { //检查当前用户是否为审核人
+                return ['status' => 'noop', 'msg' => '无审核权限'];
             }
-//            else{
-//                if ($pendingRecord->approver_id == $uid) {
-//                    return ['status' => 'noop', 'msg' => '无审核权限'];
-//                }
-//            }
 
             $now = time();
 
diff --git a/app/common/service/InvRequisitionItemReturnService.php b/app/common/service/InvRequisitionItemReturnService.php
index 445191b..05994d3 100644
--- a/app/common/service/InvRequisitionItemReturnService.php
+++ b/app/common/service/InvRequisitionItemReturnService.php
@@ -561,6 +561,13 @@ class InvRequisitionItemReturnService
         return $config;
     }
 
+    /** 分页列表 */
+    public function serviceList(Request $request, string $scene = 'index')
+    {
+        $InvRequisitionReturn = new InvRequisitionReturnService();
+        return $InvRequisitionReturn->serviceList($request, $scene);
+    }
+
     /** 查看单条 */
     public function serviceShow(Request $request, string $scene = 'show')
     {
diff --git a/app/common/service/InvRequisitionService.php b/app/common/service/InvRequisitionService.php
index ff0cacd..7b58814 100644
--- a/app/common/service/InvRequisitionService.php
+++ b/app/common/service/InvRequisitionService.php
@@ -65,7 +65,7 @@ class InvRequisitionService
                 if(isset($p['phase']) && $p['phase'] == 'approve'){//借用审批中
                     $config['where']['status'] = ['in',[10,11,13]];
                 }elseif(isset($p['phase']) && $p['phase'] == 'repaid'){//已全部归还
-                    $config['where']['unreturned'] = 17;
+                    $config['where']['status'] = 17;
                 }elseif(isset($p['phase']) && $p['phase'] == 'unreturned'){ //未归还
                     $config['where']['status'] = ['in',[12,14,15,16,18]];
                 }