Merge branch 'zjl_erp_syn_20190514' into development

app/Http/Controllers/OrderController.php

@@ -368,7 +368,7 @@ Class OrderController extends Controller
         $info['title'] = '平台订单';
 
         // 若为京东自营、自营客服角色，则跳转到自营列表
-        if (in_array($info['role'], [6, 7, 10])) {
+        if (in_array($info['role'], [6, 7, 10, 11, 12])) {
             return redirect('self_order');
         }
 
@@ -405,8 +405,8 @@ Class OrderController extends Controller
         $map['is_new_order']        = $request->input('is_new_order', '');
         $map['business_type']       = $request->input('business_type', '');
 
-        // 订单查看权限---交易员、客服、自营客服
-        if (in_array($info['role'], [3, 4, 7])) {
+        // 订单查看权限---交易员、客服、自营客服、自营内部采购
+        if (in_array($info['role'], [3, 4, 7, 12])) {
             // 筛选自己的订单
             $map['sale_id'] = $request->user->userId;
         }

app/Http/Controllers/PermController.php

@@ -90,6 +90,10 @@
 							return 9;
 						} else if ($department->name == '自营客服主管') {
 							return 10;
+						} else if ($department->name == '自营客服主管助理') {
+							return 11;
+						} else if ($department->name == '自营内部采购') {
+							return 12;
 						} else {
 							return 0;
 						}