|
@@ -109,9 +109,14 @@ class FormService implements FormServiceInterface
|
|
|
try {
|
|
try {
|
|
|
// 构建查询
|
|
// 构建查询
|
|
|
$query = GlobalTable::query()
|
|
$query = GlobalTable::query()
|
|
|
- ->when(!empty($data['name']), function($q) use ($data) {
|
|
|
|
|
- return $q->where('name', 'like', '%' . $data['name'] . '%');
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ ->when(!empty($data['name']), function($q) use ($data) {
|
|
|
|
|
+ return $q->where('name', 'like', '%' . $data['name'] . '%');
|
|
|
|
|
+ })
|
|
|
|
|
+ ->when(!empty($data['website_id']), function($q) use ($data) {
|
|
|
|
|
+ return $q->where('website_id', $data['website_id']);
|
|
|
|
|
+ })
|
|
|
|
|
+ ->leftJoin('hyperf.website', 'hyperf.website.id', '=', 'global_table.website_id')
|
|
|
|
|
+ ->select('global_table.*', 'hyperf.website.website_name');
|
|
|
|
|
|
|
|
// 分页参数
|
|
// 分页参数
|
|
|
$page = (int)($data['page'] ?? 1);
|
|
$page = (int)($data['page'] ?? 1);
|