Merge branch 'zjl_erp_syn_20190514' into development

app/Http/Controllers/OrderController.php

@@ -838,9 +838,8 @@ Class OrderController extends Controller
             $test      = $perm->getRoleUsers($request, '测试');
             $test      = $perm->getRoleUsers($request, '测试');
             $sale_list = '';
             $sale_list = '';
             $assistant = $perm->getRoleUsers($request, '自营客服主管助理');
             $assistant = $perm->getRoleUsers($request, '自营客服主管助理');
-            $purchase  = $perm->getRoleUsers($request, '自营内部采购');
             $kefu      = $perm->getRoleUsers($request, '自营客服');
             $kefu      = $perm->getRoleUsers($request, '自营客服');
-            $kefu      = array_merge($assistant, $purchase, $kefu);
+            $kefu      = array_merge($assistant, $kefu);
         } else {
         } else {
             $manager   = $perm->getRoleUsers($request, '经理');
             $manager   = $perm->getRoleUsers($request, '经理');
             $test      = $perm->getRoleUsers($request, '测试');
             $test      = $perm->getRoleUsers($request, '测试');