Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c2e25e7e by 朱继来
Options

Merge branch 'zjl_inquiry_order_20210311' into development

parents 8ac2faaa ff14d728
Inline Side-by-side
Showing with 35 additions and 44 deletions
app/Http/Controllers/PermController.php
...@@ -397,42 +397,42 @@ ...@@ -397,42 +397,42 @@
// 获取部门人员 // 获取部门人员
public function getUserByDepartmentId($department_id, $status='', $filter='') public function getUserByDepartmentId($department_id, $status='', $filter='')
{ {
$department_ids = []; $department_ids = [];
$this->getSubDepartmentId($department_id, $department_ids); $this->getSubDepartmentId($department_id, $department_ids);
$data = DB::table('user_info')->whereIn('department_id', $department_ids)
->where(function($query) use($status) {
if ($status !== '') {
$query->where('status', '=', $status);
}
})
->where(function($query) use($filter) {
if ($filter) {
$query->whereRaw($filter);
}
})
->select('userId', 'name', 'status')
->get();
return $data; $data = DB::table('user_info')->whereIn('department_id', $department_ids)
->where(function($query) use($status, $filter) {
if ($status !== '') {
$query->where('status', '=', $status);
}
if ($filter) {
$query->whereRaw($filter);
}
})
->select('userId', 'name', 'status')
->get();
return $data;
} }
// 获取下级部门ID // 获取下级部门ID
public function getSubDepartmentId($department_id, &$department_ids) public function getSubDepartmentId($department_id, &$department_ids)
{ {
// 获取下级部门 // 获取下级部门
$sub_department = DB::table('user_department')->where('parent_id', $department_id)->select('department_id', 'department_name')->get(); $sub_department = DB::table('user_department')->where('parent_id', $department_id)->select('department_id', 'department_name')->get();
if ($sub_department) { if ($sub_department) {
foreach ($sub_department as $v) { foreach ($sub_department as $v) {
$this->getSubDepartmentId($v->department_id, $department_ids); $this->getSubDepartmentId($v->department_id, $department_ids);
} }
} }
$department_ids[] = $department_id; $department_ids[] = $department_id;
return $department_ids; return $department_ids;
} }
/** /**
...@@ -463,35 +463,26 @@ ...@@ -463,35 +463,26 @@
return DB::table('user_info')->where($map)->select('userId', 'name', 'position_id', 'position_name', 'department_id', 'department_name', 'status')->get(); return DB::table('user_info')->where($map)->select('userId', 'name', 'position_id', 'position_name', 'department_id', 'department_name', 'status')->get();
} }
// 获取指定用户下级所有人员 // 获取指定用户下级所有人员
public function getSubSaleId($userId) public function getSubSaleId($userId)
{ {
$sale_ids = []; $sale_ids = [];
array_unshift($sale_ids, $userId); // 将当前用户添加到数组 array_unshift($sale_ids, $userId); // 将当前用户添加到数组
$department_id = DB::table('user_info')->where('userId', $userId)->value('department_id'); // 用户信息
$user_info = DB::table('user_info')->where('userId', $userId)->select('department_id')->first(); // 用户信息 if (!$department_id) return $sale_ids;
if (!$user_info->department_id) return $sale_ids; $department_ids = [];
// 获取当前用户下级部门 $this->getSubDepartmentId($department_id, $department_ids); // 获取下级部门ID
$department = DB::table('user_department')
->where('parent_id', $user_info->department_id)
->select('department_id', 'department_name')
->get();
if (!$department) { // 获取下级部门的人员
$tmp = DB::table('user_info')->where('department_id', $user_info->department_id)->lists('userId'); foreach ($department_ids as $v) {
$tmp = DB::table('user_info')->where('department_id', $v)->lists('userId');
$sale_ids = array_merge($sale_ids, $tmp); $sale_ids = array_merge($sale_ids, $tmp);
} else {
// 获取下级部门的人员
foreach ($department as $v) {
$tmp = DB::table('user_info')->where('department_id', $v->department_id)->lists('userId');
$sale_ids = array_merge($sale_ids, $tmp);
}
} }
return array_unique($sale_ids); // 去重返回 return array_unique($sale_ids); // 去重返回
......
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