Merge branch 'develop' of zhengxifeng/zc100 into master

application/api/controller/Diyajax.php

@@ -581,7 +581,7 @@ TRUNCATE TABLE ey_zcwd_position;
 TRUNCATE TABLE ey_zcdj_position;
      */
     public function exportData(){
-        $fileTmpPath = './public/003.xlsx';
+        $fileTmpPath = './public/006.xlsx';
         $expType = PHPExcel_IOFactory::identify($fileTmpPath);
         $objReader = PHPExcel_IOFactory::createReader($expType);
         $objPHPExcel = $objReader->load($fileTmpPath);

application/api/model/v1/Zc.php

@@ -394,6 +394,9 @@ class Zc extends Base{
             $xxlx = 1;
         }else if($xxlx_str == '非全日制'){
             $xxlx = 2;
+        }else{
+            //为空
+            $xxlx = 0;
         }
 
         //毕业年限