diff --git a/Application/Admin/Controller/MarketController.class.php b/Application/Admin/Controller/MarketController.class.php index cf519b886..b2061e223 100644 --- a/Application/Admin/Controller/MarketController.class.php +++ b/Application/Admin/Controller/MarketController.class.php @@ -67,7 +67,7 @@ class MarketController extends ThinkController 2 => '处理失败', 3 => '已取消' ]; - + $departmentNameList = A("Market",'Event')->getDepartmentNameByMarketType('nickname'); $records = []; foreach ($items as $item) { $records[] = [ @@ -77,7 +77,9 @@ class MarketController extends ThinkController 'company_belong' => $companyTypes[$recordCompanys[$recordPromotes[$item['promote_id']]['company_id']]['company_belong']], 'remark' => $item['remark'], 'from_username' => $recordAdmins[$item['from_id']]['username'], + 'from_department' => $departmentNameList[$recordAdmins[$item['from_id']]['username']] ?? "--", 'to_username' => $recordAdmins[$item['to_id']]['username'], + 'to_department' => $departmentNameList[$recordAdmins[$item['to_id']]['username']] ?? "--", 'split_time' => $item['split_time'] == 0 ? '全部' : date('Y-m-d H:i:s', $item['split_time']), 'created_time' => date('Y-m-d H:i:s', $item['created_time']), 'status_text' => $statusList[$item['status']], diff --git a/Application/Admin/View/Market/rebindRecords.html b/Application/Admin/View/Market/rebindRecords.html index 6c799cdd4..78a84b295 100644 --- a/Application/Admin/View/Market/rebindRecords.html +++ b/Application/Admin/View/Market/rebindRecords.html @@ -94,7 +94,9 @@