优化市场换绑新增市场部

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']],

Application/Admin/View/Market/rebindRecords.html

@@ -94,7 +94,9 @@
                     <th>会长账号</th>
                     <th>内外团</th>
                     <th>原市场专员</th>
+                    <th>原市场部门</th>
                     <th>新市场专员</th>
+                    <th>新市场部门</th>
                     <th>备注</th>
                     <th>订单切分时间</th>
                     <th>操作人</th>
@@ -115,7 +117,9 @@
                             <td>{$data.promote_account}</td>
                             <td>{$data.company_belong}</td>
                             <td>{$data.from_username}</td>
+                            <td>{$data.from_department}</td>
                             <td>{$data.to_username}</td>
+                            <td>{$data.to_department}</td>
                             <td>{$data.remark}</td>
                             <td>{$data.split_time}</td>
                             <td>{$data.creator_username}</td>