|
@@ -1038,12 +1038,17 @@ class VerifyApi {
|
|
$un_common_location = Db::table("un_common_location")->column('name', 'code');
|
|
$un_common_location = Db::table("un_common_location")->column('name', 'code');
|
|
foreach ($list as $kkk => &$item) {
|
|
foreach ($list as $kkk => &$item) {
|
|
if($params['select_contract'] == '1'){
|
|
if($params['select_contract'] == '1'){
|
|
- $temp_contract = explode(' - ',$item['labor_contract_rangetime']);
|
|
|
|
- //dump($temp_contract);die;
|
|
|
|
- if(strtotime($temp_contract[1]) > time() || $item['active'] == 2){
|
|
|
|
|
|
+ if($item['active'] == '2'){
|
|
unset($list[$kkk]);
|
|
unset($list[$kkk]);
|
|
continue;
|
|
continue;
|
|
|
|
+ }else{
|
|
|
|
+ $temp_contract = explode(' - ',$item['labor_contract_rangetime']);
|
|
|
|
+ if(strtotime($temp_contract[1]) > time()){
|
|
|
|
+ unset($list[$kkk]);
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
$item["card_type"] = $cardTypes[$item["card_type"]];
|
|
$item["card_type"] = $cardTypes[$item["card_type"]];
|
|
$item["industryFieldNew"] = $industry_fields[$item["industryFieldNew"]];
|
|
$item["industryFieldNew"] = $industry_fields[$item["industryFieldNew"]];
|