Commit 667e8e68 by 朱继来

调整

parent a913760d
......@@ -963,7 +963,7 @@ Class OrderController extends Controller
$info['manager'] = array_merge($manager); // 重新索引
$info['online_sales_chief'] = $perm->getUserByCondition(33, 66, 0); // 线上销售-33 总监-66
$info['online_sales_mgr'] = $perm->getDepartmentUser(33, 64); // 线上销售-33 主管-64
$info['online_sales_mgr'] = $perm->getDepartmentUser(33, 63); // 线上销售-33 销售经理-63
$info['online_sales_kefu_1'] = $perm->getUserByCondition(34, '', 0); // 线上一组
$info['online_sales_kefu_2'] = $perm->getUserByCondition(35, '', 0); // 线上二组
$info['online_sales_kefu_3'] = $perm->getUserByCondition(36, '', 0); // 线上三组
......@@ -972,7 +972,7 @@ Class OrderController extends Controller
$info['offline_sales_chief'] = $perm->getUserByCondition(40, 66, 0); // 线下销售-39 总监-66
$info['offline_sales_all'] = $perm->getDepartmentUser(40, 62); // 线下销售各组人员
$info['self_manager'] = $perm->getUserByCondition(38, [64, 66]); // 自营销售部总监、主管
$info['self_manager'] = $perm->getUserByCondition(38, [63, 66]); // 自营销售部总监、主管
$info['self_kefu'] = $perm->getUserByCondition(38, 62); // 自营销售部客服
$info['test'] = $perm->getUserByCondition('', Config('perm_args.test_position_id'), 0); // 测试
......
......@@ -442,11 +442,13 @@
$user = [];
foreach ($sub_department as $v) {
$tmp = DB::table('user_info')->where('department_id', $v->department_id)->where('position_id', $position_id)->select('userId', 'name')->first();
$tmp = DB::table('user_info')->where('department_id', $v->department_id)->where('position_id', $position_id)->select('userId', 'name')->get();
if (!$tmp) continue;
$user[] = $tmp;
foreach ($tmp as $val) {
$user[] = $val;
}
}
return $user;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment