代码提交优化
This commit is contained in:
@@ -46,13 +46,35 @@ class AiKnowledgeBaseController extends BaseController
|
||||
$where[] = ['type', '=', AiKnowledgeBaseType::TYPE_USER];
|
||||
}
|
||||
|
||||
// 统计开启的类型总数
|
||||
$enabledCountWhere = $where;
|
||||
$enabledCountWhere[] = ['status', '=', 1];
|
||||
$enabledCount = AiKnowledgeBaseType::where($enabledCountWhere)->count();
|
||||
|
||||
// 查询数据
|
||||
$list = AiKnowledgeBaseType::where($where)
|
||||
->order('type', 'asc') // 系统类型排在前面
|
||||
->order('createTime', 'desc')
|
||||
->paginate($pageSize, false, ['page' => $page]);
|
||||
|
||||
return ResponseHelper::success($list, '获取成功');
|
||||
// 为每个类型添加素材数量统计
|
||||
$listData = $list->toArray();
|
||||
foreach ($listData['data'] as &$item) {
|
||||
// 统计该类型下的知识库数量(素材数量)
|
||||
$item['materialCount'] = AiKnowledgeBase::where([
|
||||
['typeId', '=', $item['id']],
|
||||
['isDel', '=', 0]
|
||||
])->count();
|
||||
}
|
||||
|
||||
// 重新构造返回数据
|
||||
$result = [
|
||||
'total' => $listData['total'],
|
||||
'data' => $listData['data'],
|
||||
'enabledCount' => $enabledCount, // 开启的类型总数
|
||||
];
|
||||
|
||||
return ResponseHelper::success($result, '获取成功');
|
||||
|
||||
} catch (\Exception $e) {
|
||||
return ResponseHelper::error('系统异常:' . $e->getMessage());
|
||||
@@ -419,6 +441,11 @@ class AiKnowledgeBaseController extends BaseController
|
||||
->order('createTime', 'desc')
|
||||
->paginate($pageSize, false, ['page' => $page]);
|
||||
|
||||
foreach ($list as &$v){
|
||||
$v['size'] = 0;
|
||||
}
|
||||
unset($v);
|
||||
|
||||
return ResponseHelper::success($list, '获取成功');
|
||||
|
||||
} catch (\Exception $e) {
|
||||
|
||||
Reference in New Issue
Block a user