1

application/api/controller/UserLeave.php

@@ -231,7 +231,6 @@ class UserLeave extends Base
 
     }
 
-
     /**
      * @title 需要我审批的
      * @desc 需要我审批的
@@ -245,16 +244,13 @@ class UserLeave extends Base
      */
     public function getApproveLeave()
     {
-        $list = LeaveApprove::where(['l.approve_user'=>$this->user_id])
-            ->alias('l')
-            ->field("l.*")
+        $list = LeaveApprove::with('leaveInfo')->where(['approve_user'=>$this->user_id])
             ->where('status','>','0')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         $this->success('ok',['list'=>$list]);
     }
 
-
     /**
      * @title 审批请假记录
      * @desc 审批请假记录

application/common/model/LeaveApprove.php

@@ -4,5 +4,13 @@ use think\Model;
 // 请假审批记录
 class LeaveApprove extends Model
 {
+        public  function leaveInfo()
+        {
+            return $this->belongsTo('LeaveInfo','level_id')
+                ->alias('l')
+                ->field('l.id,l.status,l.approve_time,l.approve_user,l.leave_id,l.remark,l.time,u.name user_name,headimg')
+                ->leftJoin('StoreMember u','u.id = l.approve_user')
+                ->order('id asc');
+        }
 
 }