|
@@ -57,12 +57,7 @@ class AdminHistory extends Controller
|
|
|
->paginate($limit)->toarray();
|
|
->paginate($limit)->toarray();
|
|
|
if (isset($result['data']) && count($result['data']) > 0) {
|
|
if (isset($result['data']) && count($result['data']) > 0) {
|
|
|
foreach ($result['data'] as $key => $value) {
|
|
foreach ($result['data'] as $key => $value) {
|
|
|
- $is_admin = $value['is_admin'];
|
|
|
|
|
- if ($is_admin == '1') {
|
|
|
|
|
- $result['data'][$key]['username'] = $AdminUserModel->where('uid', $value['admin_uid'])->value('username');
|
|
|
|
|
- } else {
|
|
|
|
|
- $result['data'][$key]['username'] = $EmployeeModel->where('id', $value['admin_uid'])->value('name');
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ $result['data'][$key]['username'] = $value['user_name'];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
// 分配数据
|
|
// 分配数据
|