正在显示
1 个修改的文件
包含
9 行增加
和
2 行删除
| @@ -40,13 +40,20 @@ class TaskLogic extends BaseLogic | @@ -40,13 +40,20 @@ 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); | ||
| 43 | foreach ($data['list'] as $v){ | 50 | foreach ($data['list'] as $v){ |
| 44 | - $map = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()]; | 51 | + $ids = TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray(); |
| 45 | $list[] = [ | 52 | $list[] = [ |
| 46 | "manage_id" => $v['manage_id'], | 53 | "manage_id" => $v['manage_id'], |
| 47 | "manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']), | 54 | "manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']), |
| 48 | "count" => $v['count'], | 55 | "count" => $v['count'], |
| 49 | - "task_list" => $this->getList($map, $sort, $columns)['list'] ?? [] | 56 | + "task_list" => $this->model->list(['id'=>['in',$ids]]), |
| 50 | ]; | 57 | ]; |
| 51 | } | 58 | } |
| 52 | return $this->success($list); | 59 | return $this->success($list); |
-
请 注册 或 登录 后发表评论