fnvtk/ckb-SuperAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码兼容性提交

Browse Source
This commit is contained in:
wong
2026-01-31 15:19:11 +08:00
parent 9bc1d7d7bf
commit ab5885f2a0
27 changed files with 185 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Server/application/cunkebao/controller/workbench/WorkbenchHelperController.php
View File

@@ -142,7 +142,7 @@ class WorkbenchHelperController extends Controller
$keyword = $this->request->param('keyword', '');
$companyId = $this->request->userInfo['companyId'];
$baseQuery = Db::name('traffic_source_package')->alias('tsp')
$baseQuery = Db::name('traffic_source_package_v1')->alias('tsp')
->where('tsp.isDel', 0)
->whereIn('tsp.companyId', [$companyId, 0]);
@@ -153,7 +153,7 @@ class WorkbenchHelperController extends Controller
$total = (clone $baseQuery)->count();
$list = $baseQuery
->leftJoin('traffic_source_package_item tspi', 'tspi.packageId = tsp.id and tspi.isDel = 0')
->leftJoin('traffic_source_package_item_v1 tspi', 'tspi.packageId = tsp.id and tspi.isDel = 0')
->field('tsp.id,tsp.name,tsp.description,tsp.pic,tsp.companyId,COUNT(tspi.id) as itemCount,max(tspi.createTime) as latestImportTime')
->group('tsp.id')
->order('tsp.id', 'desc')