1

application/api/controller/General.php

@@ -2,6 +2,7 @@
 namespace app\api\controller;
 
 use app\common\model\CarApprove;
+use app\common\model\DocumentApprove;
 use hg\apidoc\annotation as Apidoc;
 use think\Db;
 
@@ -38,8 +39,7 @@ class General extends Base
             ->order('create_at desc,id desc')
             ->limit($this->off_set,$this->page_num)
             ->select();
-        foreach ($list as &$v)
-        {
+        foreach ($list as &$v) {
             switch ($v['module']) {
                 case "car_approve":
                     $v['approve_info'] = CarApprove::field('i.*,p.status approve_status,p.approve_time,p.remark')
@@ -50,6 +50,12 @@ class General extends Base
                         ->find()->toArray();
                     break;
                 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.status','>','0')
+                        ->leftJoin('DocumentInfo i','p.info_id = i.id')
+                        ->find()->toArray();
                     break;
                 case "evection_approve":
                     break;