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

12
Server/application/cunkebao/controller/workbench/WorkbenchController.php
View File

@@ -1002,8 +1002,8 @@ class WorkbenchController extends Controller
// 处理普通流量池
if (!empty($normalPools)) {
$normalPoolList = Db::name('traffic_source_package')->alias('tsp')
->leftJoin('traffic_source_package_item tspi', 'tspi.packageId = tsp.id and tspi.isDel = 0')
$normalPoolList = Db::name('traffic_source_package_v1')->alias('tsp')
->leftJoin('traffic_source_package_item_v1 tspi', 'tspi.packageId = tsp.id and tspi.isDel = 0')
->whereIn('tsp.id', $normalPools)
->where('tsp.isDel', 0)
->whereIn('tsp.companyId', [$companyId, 0])
@@ -1042,8 +1042,8 @@ class WorkbenchController extends Controller
}
if (!empty($workbench->config->poolGroups)) {
$poolGroupsOptions = Db::name('traffic_source_package')->alias('tsp')
->join('traffic_source_package_item tspi', 'tspi.packageId=tsp.id', 'left')
$poolGroupsOptions = Db::name('traffic_source_package_v1')->alias('tsp')
->join('traffic_source_package_item_v1 tspi', 'tspi.packageId=tsp.id', 'left')
->whereIn('tsp.companyId', [$this->request->userInfo['companyId'], 0])
->whereIn('tsp.id', $workbench->config->poolGroups)
->field('tsp.id,tsp.name,tsp.description,tsp.createTime,count(tspi.id) as num')
@@ -2399,8 +2399,8 @@ class WorkbenchController extends Controller
// 查询发布记录
$list = Db::name('workbench_import_contact_item')->alias('wici')
->join('traffic_pool tp', 'tp.id = wici.poolId', 'left')
->join('traffic_source tc', 'tc.identifier = tp.identifier', 'left')
->join('traffic_pool_v1 tp', 'tp.id = wici.poolId', 'left')
->join('traffic_source_v1 tc', 'tc.identifier = tp.identifier', 'left')
->join('wechat_account wa', 'wa.wechatId = tp.wechatId', 'left')
->field([
'wici.id',