diff --git a/backend/app/controller/ApprovalController.php b/backend/app/controller/ApprovalController.php index ea88c45..482c208 100644 --- a/backend/app/controller/ApprovalController.php +++ b/backend/app/controller/ApprovalController.php @@ -3,6 +3,7 @@ namespace app\controller; use app\service\ApprovalService; +use app\model\ApprovalOrder; use Webman\Http\Request; use Webman\Http\Response; @@ -15,6 +16,18 @@ class ApprovalController extends BaseController $this->service = new ApprovalService(); } + /** + * 获取路由参数 + */ + private function getRouteParam(Request $request, string $name, $default = null) + { + $route = $request->route; + if ($route && method_exists($route, 'param')) { + return $route->param($name) ?? $default; + } + return $default; + } + /** * 获取审批列表 */ @@ -35,9 +48,9 @@ class ApprovalController extends BaseController */ public function detail(Request $request): Response { - $id = (int) $request->route('id'); + $id = (int) $this->getRouteParam($request, 'id'); - $approval = \App\Model\ApprovalOrder::with(['flow', 'applicant', 'records']) + $approval = ApprovalOrder::with(['flow', 'applicant', 'records']) ->findOrFail($id); return $this->success($approval); @@ -49,7 +62,7 @@ class ApprovalController extends BaseController public function approve(Request $request): Response { $userId = $this->getUserId($request); - $id = (int) $request->route('id'); + $id = (int) $this->getRouteParam($request, 'id'); $data = $request->post(); $data = $data ?? []; $comment = $data['comment'] ?? null; @@ -68,7 +81,7 @@ class ApprovalController extends BaseController public function reject(Request $request): Response { $userId = $this->getUserId($request); - $id = (int) $request->route('id'); + $id = (int) $this->getRouteParam($request, 'id'); $data = $request->post(); $data = $data ?? []; $comment = $data['comment'] ?? null; @@ -87,7 +100,7 @@ class ApprovalController extends BaseController public function cancel(Request $request): Response { $userId = $this->getUserId($request); - $id = (int) $request->route('id'); + $id = (int) $this->getRouteParam($request, 'id'); try { $approval = $this->service->cancel($id, $userId); diff --git a/backend/app/controller/BaseController.php b/backend/app/controller/BaseController.php index eae4b86..74adf8b 100644 --- a/backend/app/controller/BaseController.php +++ b/backend/app/controller/BaseController.php @@ -52,7 +52,7 @@ abstract class BaseController } // 解析 token - $payload = \App\Util\JwtUtil::decode($token); + $payload = app\util\JwtUtil::decode($token); if (!$payload) { return null; } diff --git a/backend/app/model/ApprovalNode.php b/backend/app/model/ApprovalNode.php index 6a1ba79..72cf17f 100644 --- a/backend/app/model/ApprovalNode.php +++ b/backend/app/model/ApprovalNode.php @@ -26,7 +26,7 @@ class ApprovalNode extends Model ]; /** - * 节点类型常量 + * 节点类型常量(与数据库 enum 保持一致) */ const TYPE_APPROVER = 'approver'; // 审批人(单人) const TYPE_AND_APPROVE = 'and_approve'; // 会签(需所有人通过) @@ -76,4 +76,12 @@ class ApprovalNode extends Model { return $this->type === self::TYPE_OR_APPROVE; } + + /** + * 判断是否是单人审批 + */ + public function isSingleApprove(): bool + { + return $this->type === self::TYPE_APPROVER; + } } diff --git a/backend/app/service/ApprovalService.php b/backend/app/service/ApprovalService.php index b3d775e..42c1fb8 100644 --- a/backend/app/service/ApprovalService.php +++ b/backend/app/service/ApprovalService.php @@ -233,7 +233,7 @@ class ApprovalService $node = ApprovalNode::findOrFail($nodeId); $records = ApprovalRecord::where('order_id', $orderId) ->where('node_id', $nodeId) - ->where('action', ApprovalRecord::ACTION_APPROVE) + ->where('action', 'approve') ->get(); $approvers = $node->approvers ?? [];