wupengfei 2 年之前
父節點
當前提交
f3576cc3a6
共有 1 個文件被更改,包括 9 次插入2 次删除
  1. 9 2
      application/api/controller/General.php

+ 9 - 2
application/api/controller/General.php

@@ -3,6 +3,7 @@ namespace app\api\controller;
 
 use app\common\model\CarApprove;
 use app\common\model\DocumentApprove;
+use app\common\model\MaintainApprove;
 use hg\apidoc\annotation as Apidoc;
 use think\Db;
 
@@ -44,7 +45,7 @@ class General extends Base
                 case "car_approve":
                     $v['approve_info'] = CarApprove::field('i.*,p.status approve_status,p.approve_time,p.remark')
                         ->alias('p')
-                        ->where(['p.approve_user'=>$this->user_id])
+                        ->where(['p.id'=>$v['id']])
                         ->where('p.status','>','0')
                         ->leftJoin('CarInfo i','p.car_id = i.id')
                         ->find()->toArray();
@@ -52,7 +53,7 @@ class General extends Base
                 case "document_approve":
                     $v['approve_info'] =DocumentApprove::field('i.*,p.id approve_id,p.status approve_status,p.approve_time,p.remark')
                         ->alias('p')
-                        ->where(['p.approve_user'=>$this->user_id])
+                        ->where(['p.id'=>$v['id']])
                         ->where('p.status','>','0')
                         ->leftJoin('DocumentInfo i','p.info_id = i.id')
                         ->find()->toArray();
@@ -62,6 +63,12 @@ class General extends Base
                 case "leave_approve":
                     break;
                 case "maintain_approve":
+                    $v['approve_info'] =MaintainApprove::field('i.*,p.id approve_id,p.status approve_status,p.approve_time,p.remark')
+                        ->alias('p')
+                        ->where(['p.id'=>$v['id']])
+                        ->where('p.status','>','0')
+                        ->leftJoin('MaintainInfo i','p.info_id = i.id')
+                        ->find()->toArray();
                     break;
                 case "offer_approve":
                     break;