github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 19:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf 新增部门负责人标识并排第一位

Browse Source
This commit is contained in:
ganzizi 2023-04-28 09:28:44 +08:00
parent 0b1f433fe4
commit 1a3ecbb4e9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Api/UsersController.php
View File

@ -707,11 +707,10 @@ class UsersController extends AbstractController
$query->where("department", "")->orWhere("department", ",,"); $query->where("department", "")->orWhere("department", ",,");
}); });
} else { } else {
// 关联user_departments表中owner_userid查询出负责人，重新排序，部门负责人始终在前面
$builder->where(function($query) use ($keys) { $builder->where(function($query) use ($keys) {
$query->where("department", "like", "%,{$keys['department']},%") $query->where("department", "like", "%,{$keys['department']},%")
->orWhereIn('userid', function ($query) use ($keys) { ->orWhereIn('userid', function ($query) use ($keys) {
$query->select('owner_userid')->from('user_departments')->where("id", "=", trim($keys['department'], ',')) $query->select(['owner_userid'])->from('user_departments')->where("id", "=", trim($keys['department'], ','))
->orderByRaw("FIELD(owner_userid,{$keys['department']}) DESC"); ->orderByRaw("FIELD(owner_userid,{$keys['department']}) DESC");
}); });
}); });
@ -726,7 +725,7 @@ class UsersController extends AbstractController
$builder->whereNull('disable_at'); $builder->whereNull('disable_at');
$builder->where('bot', 0); $builder->where('bot', 0);
} }
$builder = $keys['department'] == '0' ? $builder->orderByDesc('userid') : $builder; $builder = $keys['department'] == '1' ? $builder : $builder->orderByDesc('userid');
$list = $builder->paginate(Base::getPaginate(50, 20)); $list = $builder->paginate(Base::getPaginate(50, 20));
// //
if ($getCheckinMac || isset($keys['department'])) { if ($getCheckinMac || isset($keys['department'])) {