Merge branch 'zjl_action_log_20190116' into development

app/Http/Controllers/OrderController.php

@@ -780,7 +780,7 @@ Class OrderController extends Controller
         $test = $perm->getRoleUsers($request, '测试');
         $test = $perm->getRoleUsers($request, '测试');
         $sale_list = $perm->getRoleUsers($request, '交易员');
         $sale_list = $perm->getRoleUsers($request, '交易员');
         $kefu = $perm->getRoleUsers($request, '客服');
         $kefu = $perm->getRoleUsers($request, '客服');
- 
+
         $info['manager']   = $this->filterLeave($manager);
         $info['manager']   = $this->filterLeave($manager);
         $info['test']      = $this->filterLeave($test);
         $info['test']      = $this->filterLeave($test);
         $info['sale_list'] = $this->filterLeave($sale_list);
         $info['sale_list'] = $this->filterLeave($sale_list);
@@ -794,8 +794,6 @@ Class OrderController extends Controller
     // 去掉已离职人员
     // 去掉已离职人员
     public function filterLeave(&$data)
     public function filterLeave(&$data)
     {
     {
-        $data = array();
-
         if (!empty($data)) {
         if (!empty($data)) {
             foreach ($data as $k => $v) {
             foreach ($data as $k => $v) {
                 if ($v->status == 4) {
                 if ($v->status == 4) {