Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -45,14 +45,14 @@ class ImportManager extends Command
         $values = array_reverse($values);
         $values = array_reverse($values);
         foreach ($values as $k => $v){
         foreach ($values as $k => $v){
             $v = (array)$v;
             $v = (array)$v;
-            $data = [
-                'name'=>$v['name'],
-                'mobile'=>$v['mobile'],
-                'password'=>'$2y$10$ZNHxlIddWiQzQbIIzFgYJOsPlQ4n0cwWl8Sea53qvQvDXtu3WeYMC',
-                'created_at'=>date('Y-m-d H:i:s'),
-                'updated_at'=>date('Y-m-d H:i:s'),
-            ];
-            $manager_id = DB::table('gl_manage')->insertGetId($data);
+//            $data = [
+//                'name'=>$v['name'],
+//                'mobile'=>$v['mobile'],
+//                'password'=>'$2y$10$ZNHxlIddWiQzQbIIzFgYJOsPlQ4n0cwWl8Sea53qvQvDXtu3WeYMC',
+//                'created_at'=>date('Y-m-d H:i:s'),
+//                'updated_at'=>date('Y-m-d H:i:s'),
+//            ];
+//            $manager_id = DB::table('gl_manage')->insertGetId($data);
             if($v['sex'] == '女'){
             if($v['sex'] == '女'){
                 $v['sex'] = 2;
                 $v['sex'] = 2;
             }else{
             }else{
@@ -101,7 +101,7 @@ class ImportManager extends Command
             }
             }
             //获取级别
             //获取级别
             $jobLevelModel = new JobLevel();
             $jobLevelModel = new JobLevel();
-            $p_level = $jobLevelModel->read(['name'=>$v['p_level']]);
+            $p_level = $jobLevelModel->read(['name'=>$v['p_level'] ?? 'ceshi']);
             if($entry_position !== false){
             if($entry_position !== false){
                 $p_level = $p_level['id'];
                 $p_level = $p_level['id'];
             }else{
             }else{