作者 lyh

gx

@@ -40,19 +40,13 @@ class TaskLogic extends BaseLogic @@ -40,19 +40,13 @@ class TaskLogic extends BaseLogic
40 ->groupBy('gto.manage_id') 40 ->groupBy('gto.manage_id')
41 ->paginate($limit)->toArray(); 41 ->paginate($limit)->toArray();
42 $list = []; 42 $list = [];
43 - $map = array_map(function ($v) {  
44 - if(!Str::startsWith($v[0], 'gto.')) {  
45 - return $v;  
46 - }  
47 - return [];  
48 - }, $map);  
49 - $map = array_filter($map);  
50 foreach ($data['list'] as $v){ 43 foreach ($data['list'] as $v){
  44 + $map = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()];
51 $list[] = [ 45 $list[] = [
52 "manage_id" => $v['manage_id'], 46 "manage_id" => $v['manage_id'],
53 "manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']), 47 "manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']),
54 "count" => $v['count'], 48 "count" => $v['count'],
55 - "task_list" => $this->getList(['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()], $sort, $columns)['list'] ?? [] 49 + "task_list" => $this->getList($map, $sort, $columns)['list'] ?? []
56 ]; 50 ];
57 } 51 }
58 return $this->success($list); 52 return $this->success($list);