Commit d3bab554 by 杨树贤

展示离职装填

parent 04a9fa4c
...@@ -133,7 +133,11 @@ class IntracodeModel extends Model ...@@ -133,7 +133,11 @@ class IntracodeModel extends Model
$users = $this->getEncodeByUserIds($userIds, $includeResign); $users = $this->getEncodeByUserIds($userIds, $includeResign);
$result = []; $result = [];
foreach ($users as $code) { foreach ($users as $code) {
$result[$code['code_id']] = $code['name'] . '(' . $code['code_id'] . ')'; if ($code['status'] == 0) {
$result[$code['code_id']] = $code['name'] . '(' . $code['code_id'] . ')';
} else {
$result[$code['code_id']] = $code['name'] . '(' . $code['code_id'] . ')' . ' (已离职)';
}
} }
return $result; return $result;
} }
...@@ -162,7 +166,7 @@ class IntracodeModel extends Model ...@@ -162,7 +166,7 @@ class IntracodeModel extends Model
{ {
$query = $this->where('admin_id', '>', 0)->join('user_info', 'lie_intracode.admin_id', '=', 'user_info.userId') $query = $this->where('admin_id', '>', 0)->join('user_info', 'lie_intracode.admin_id', '=', 'user_info.userId')
->whereIn('user_info.userId', $userIds) ->whereIn('user_info.userId', $userIds)
->select('code_id', 'admin_id', 'name', 'email', 'mobile'); ->select('code_id', 'admin_id', 'name', 'email', 'mobile', 'user_info.status');
$code = $includeResign ? $query->get() : $query->where('user_info.status', '!=', 4)->get(); $code = $includeResign ? $query->get() : $query->where('user_info.status', '!=', 4)->get();
if ($code) { if ($code) {
$code = $code->toArray(); $code = $code->toArray();
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
return `<span style="color: #D7D7D7">${data.jd_resign_channel_username}</span>` return `<span style="color: #D7D7D7">${data.jd_resign_channel_username}</span>`
} }
} else { } else {
return `<span>${data.on_job_channel_username}</span>`; return `<span>${data.jd_on_job_channel_username}</span>`;
} }
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment