|
...
|
...
|
@@ -40,20 +40,20 @@ class TaskLogic extends BaseLogic |
|
|
|
->groupBy('gto.manage_id')
|
|
|
|
->paginate($limit)->toArray();
|
|
|
|
$list = [];
|
|
|
|
$map = array_map(function ($v) {
|
|
|
|
if(!Str::startsWith($v[0], 'gto.')) {
|
|
|
|
return $v;
|
|
|
|
}
|
|
|
|
return [];
|
|
|
|
}, $map);
|
|
|
|
$map = array_filter($map);
|
|
|
|
// $map = array_map(function ($v) {
|
|
|
|
// if(!Str::startsWith($v[0], 'gto.')) {
|
|
|
|
// return $v;
|
|
|
|
// }
|
|
|
|
// return [];
|
|
|
|
// }, $map);
|
|
|
|
// $map = array_filter($map);
|
|
|
|
foreach ($data['list'] as $v){
|
|
|
|
$map[] = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()];
|
|
|
|
$maps[] = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()];
|
|
|
|
$list[] = [
|
|
|
|
"manage_id" => $v['manage_id'],
|
|
|
|
"manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']),
|
|
|
|
"count" => $v['count'],
|
|
|
|
"task_list" => $this->getList($map, $sort, $columns)['list'] ?? []
|
|
|
|
"task_list" => $this->getList($maps, $sort, $columns)['list'] ?? []
|
|
|
|
];
|
|
|
|
}
|
|
|
|
return $this->success($list);
|
...
|
...
|
|