wupengfei 2 年之前
父节点
当前提交
c4cc307b03
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 4 3
      application/api/controller/UserCar.php
  2. 1 1
      application/car/controller/CarInfo.php

+ 4 - 3
application/api/controller/UserCar.php

@@ -97,13 +97,10 @@ class UserCar extends Base
         $request_param['user_id'] = $this->user_id;
         $request_param['apply_user'] = $this->user_id;
 
-
-
         $flow = CarFlow::getApproveUser();// 用车审批流程设置
         $flow_user = array_column($flow,'user_id');
         $flow_key = array_search($request_param['user_id'],$flow_user);// 请用车是否在审批流程人员中
 
-
         $copy = CarFlow::getCopyTo();
         $copy_user = array_column($copy,'user_id');
         $copy_key = array_search($request_param['user_id'],$copy_user);// 用车人是否在抄送人员中
@@ -149,6 +146,10 @@ class UserCar extends Base
 
 
 
+
+
+
+
 }
 
 

+ 1 - 1
application/car/controller/CarInfo.php

@@ -125,7 +125,7 @@ class CarInfo extends Controller
             ->alias('r')
             ->field('r.*,u.name,u.phone,u.headimg')
             ->leftJoin('store_member u','u.id = r.approve_user')
-            ->where('r.leave_id',$id)
+            ->where('r.car_id',$id)
             ->order('r.id desc')->page(false);
         $this->assign('list',$list);
         $this->fetch();