Merge branch 'master' of http://59.57.98.130:3000/jjhc/jucai

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -510,8 +510,9 @@ class IndexController extends WebBaseController
                 $user_info['family'] = json_decode($user_info['family']);
                 if(in_array('expand_special',$forms)){
                     $special = RecruitAppointExpandSpecial::where('recruit_appoint_id',$user_info['id'])->first();
+
                     if($special){
-                        if(strpos(',',$special['condition']) !== false){
+                        if(strpos($special['condition'],',') !== false){
                             $special['condition'] = explode(',',$special['condition']);
                         }
                         $material = json_decode($special['material'],true);
@@ -823,9 +824,9 @@ class IndexController extends WebBaseController
             return response()->json(['status' => 0,'msg' => '请选择项目!']);
         }
         $recruit = Recruit::find($recruit_id);
-        if(!$recruit['status']){
-            return response()->json(['status' => 0,'msg' => '抱歉，该项目状态不正确，请联系客服！']);
-        }
+//        if(!$recruit['status']){
+//            return response()->json(['status' => 0,'msg' => '抱歉，该项目状态不正确，请联系客服！']);
+//        }
         if($recruit['current'] != 1 && $recruit['current'] != 2){
             return response()->json(['status' => 0,'msg' => '抱歉，该项目报名通道已关闭，如有疑问，请联系客服！']);
         }
@@ -1016,12 +1017,13 @@ class IndexController extends WebBaseController
         $forms = explode(',', $recruit['forms']);
         if(in_array('expand_special',$forms)){
             $special = $request->input('special');
-            if($special['point_apply'] && $special['condition'] == ''){
+            if($special['point_apply'] && ($special['condition'] == '' || count($special['condition']) == 0)){
                 return response()->json(['status' => 0,'msg' => '加分条件不能为空']);
             }
         }
 
         $data['family'] = json_encode($family);
+
         if($appoint_info){
             //如果已有报名记录，进入修改阶段的处理流程
             DB::beginTransaction();
@@ -1214,10 +1216,14 @@ class IndexController extends WebBaseController
                                 }
                             }
                         }
+                        if(is_array($special['condition'])){
+                            $special['condition'] = implode(',',$special['condition']);
+                        }
                         $special['material'] = json_encode($special['material']);
+
+                        $special['recruit_appoint_id'] = $appoint_info->id;
+                        RecruitAppointExpandSpecial::create($special);
                     }
-                    $special['recruit_appoint_id'] = $result->id;
-                    RecruitAppointExpandSpecial::create($special);
                 }
                 //如果有详情模块
                 if(in_array('detail',$forms)  || in_array('internship',$forms)){

app/Repositories/CompanyRepository.php

@@ -190,7 +190,7 @@ class CompanyRepository extends BaseRepository
         if (!Schema::hasColumn($this->model->getTable(), $key)) {
             return true;
         }
-        if ($this->model->withTrashed()->where($key, $value)
+        if ($this->model->withTrashed()->where($key, $value)->whereRaw('deleted_at is null')
             ->when($id>0, function ($query) use ($id) {
                 return $query->where('id', '<>', $id);
             })->first()) {

public/themes/default/views/app/recruit/sign_up.blade.php

@@ -769,16 +769,18 @@
                             <td valign="center" >
                                 是否申请加分
                             </td>
-                            <td valign="center" colspan="4">
+                            <td valign="center" colspan="11">
                                 <el-form-item prop="special.point_apply" >
                                     <el-radio label="1" v-model="user.special.point_apply">是</el-radio>
                                     <el-radio label="0" v-model="user.special.point_apply">否</el-radio>
                                 </el-form-item>
                             </td>
-                            <td valign="center" colspan="3">
+                        </tr>
+                        <tr>
+                            <td valign="center" colspan="1">
                                 符合哪一项加分条件
                             </td>
-                            <td valign="center" colspan="4" >
+                            <td valign="center" colspan="11" >
                                 @if($special_condition_type == 0)
                                     <el-form-item prop="special_condition">
                                         <el-input v-model="user.special.condition" placeholder="请输入您符合的加分条件"></el-input>
@@ -2299,7 +2301,7 @@
                 @if($special_condition_type == 2)
                 if(this.user.post_id > 0){
                     this.special_select = this.post_special[this.user.post_id];
-                    console.log(this.special_select)
+                    console.log(this.user)
                 }
                 @endif