归还详情与编辑

app/common/service/InvRequisitionApproveService.php

@@ -99,7 +99,7 @@ class InvRequisitionApproveService
             throw new BusinessException("无效的审批操作");
         }
 
-        return Db::transaction(function () use ($requisitionId, $approverId, $action, $comment) {
+        return Db::transaction(function () use ($requisitionId, $approverId, $uid, $action, $comment) {
 //            $instance = Db::table('approval_instances')->where('id', $instanceId)->lockForUpdate()->first();
             $requisition = Db::table('inv_requisition')->where('id', $requisitionId)->lockForUpdate()->first();
             if (!$requisition) throw new BusinessException("审批实例未找到");
@@ -138,6 +138,10 @@ class InvRequisitionApproveService
 //                    return ['status' => 'noop', 'msg' => '非当前审批'];
 //                }
                 return ['status' => 'noop', 'msg' => '无待处理记录'];
+            }else{
+                if ($pendingRecord->approver_id == $uid) {
+                    return ['status' => 'noop', 'msg' => '无审核权限'];
+                }
             }
 
             $now = time();
@@ -161,7 +165,7 @@ class InvRequisitionApproveService
                         ->where('requisition_id', $requisition->id)
                         ->where('is_consumable_snap', 0)
                         ->get();
-                    if(!$requisitionItem){
+                    if($requisitionItem){
                         Db::table('inv_requisition')->where('id', $requisition->id)->update(['status'=>12]);
                     }else{
                         Db::table('inv_requisition')->where('id', $requisition->id)->update(['status'=>19]);