|
@@ -102,13 +102,12 @@ class Api extends BaseController {
|
|
|
if ($enterpriseId) {
|
|
|
$where[] = ["mainId", "=", $enterpriseId];
|
|
|
$ids = \app\enterprise\model\EnterpriseRecord::where($where)->column("id");
|
|
|
- if ($ids) {
|
|
|
- $where = [];
|
|
|
- $where[] = ["type", "=", $type];
|
|
|
- $where[] = ["active", "=", 1];
|
|
|
- $where[] = ["mainId", "in", $ids];
|
|
|
- $list = TalentChecklog::where($where)->order("createTime desc")->select();
|
|
|
- }
|
|
|
+ $ids[] = $enterpriseId;
|
|
|
+ $where = [];
|
|
|
+ $where[] = ["type", "=", $type];
|
|
|
+ $where[] = ["active", "=", 1];
|
|
|
+ $where[] = ["mainId", "in", $ids];
|
|
|
+ $list = TalentChecklog::where($where)->order("createTime desc")->select();
|
|
|
} else {
|
|
|
$list = TalentLogApi::getList($type, $mainId);
|
|
|
}
|