Merge remote-tracking branch 'remotes/origin/master'

# Conflicts:
#	app/admin/controller/Talent.php

app/admin/controller/Talent.php

@@ -82,22 +82,24 @@ class Talent extends AdminController {
                 $info['rs']['I010902'] = $content['I010902'] = $rsapi->I010902($info['card_number']);
                 $info['rs']['I030101'] = $content['I030101'] = $rsapi->I030101($info['card_number']);
                 /*                 * ***********************处理养老缴费判断开始*************** */
-                $tmp_time = explode(' - ', $info['tax_insurance_month']);
-                $content['YL00018'] = $rsapi->YL00018($info['card_number'], str_replace('-', '', $tmp_time[0]), str_replace('-', '', $tmp_time[1]));
-                $formatDate = formatDateByMonth($tmp_time[0], $tmp_time[1], $content['YL00018']['data']['list']);
-                $str = '';
-                foreach ($formatDate as $tmp_item) {
-                    $str .= $tmp_item . "<br />";
-                }
-                if (count($formatDate) == $content['YL00018']['data']['totalCount']) {
-                    $content['YL00018']['status'] = 'success';
-                } else {
-                    $content['YL00018']['status'] = 'warning';
+                if(!empty($info['tax_insurance_month'])){
+                    $tmp_time = explode(' - ', $info['tax_insurance_month']);
+                    $content['YL00018'] = $rsapi->YL00018($info['card_number'], str_replace('-', '', $tmp_time[0]), str_replace('-', '', $tmp_time[1]));
+                    $formatDate = formatDateByMonth($tmp_time[0], $tmp_time[1], $content['YL00018']['data']['list']);
+                    $str = '';
+                    foreach ($formatDate as $tmp_item) {
+                        $str .= $tmp_item . "<br />";
+                    }
+                    if (count($formatDate) == $content['YL00018']['data']['totalCount']) {
+                        $content['YL00018']['status'] = 'success';
+                    } else {
+                        $content['YL00018']['status'] = 'warning';
+                    }
+                    $content['YL00018']['content'] = "该人员社保填写日期为{$tmp_time[0]}至{$tmp_time[1]}，共" . count($formatDate) . "个月，接口返回{$content['YL00018']['data']['totalCount']}个月数据，分别为：<br />$str";
+                    $info['rs']['YL00018'] = $content['YL00018'];
+                    unset($tmp_time);
+                    unset($tmp_item);
                 }
-                $content['YL00018']['content'] = "该人员社保填写日期为{$tmp_time[0]}至{$tmp_time[1]}，共" . count($formatDate) . "个月，接口返回{$content['YL00018']['data']['totalCount']}个月数据，分别为：<br />$str";
-                $info['rs']['YL00018'] = $content['YL00018'];
-                unset($tmp_time);
-                unset($tmp_item);
                 /*                 * ***********************处理养老缴费判断结束*************** */
                 /*                 * ***********************处理职业资格证书开始*************** */
                 if (!empty($info['pro_qua'])) {