Bläddra i källkod

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Admin/Controllers/Recruit/RecruitController.php
zmw 1 år sedan
förälder
incheckning
f58cd0ec05
1 ändrade filer med 1 tillägg och 4 borttagningar
  1. 1 4
      app/Admin/Controllers/Recruit/RecruitController.php

+ 1 - 4
app/Admin/Controllers/Recruit/RecruitController.php

@@ -626,14 +626,12 @@ class RecruitController extends Controller
         $data['reexamine_ticket_content'] = $verify['reexamine_ticket_content'];
         $data['reexamine_field'] = implode(',',$verify['reexamine_field']);
         $ids = RecruitPost::where('recruit_id', $recruit_id)->pluck('id');
-        //$fileCharater = $request->input('addFile');
+        $fileCharater = $request->input('addFile');
         $data['special'] = 0;
 
-
         DB::beginTransaction();//检查数据库事务
         try {
             $res = Recruit::where('id', $recruit_id)->update($data);
-
             $postcode_array = $request->postcode;
             $postname_array = $request->postname;
             $postnumber_array = $request->postnumber;
@@ -709,7 +707,6 @@ class RecruitController extends Controller
             return admin_toastr('操作成功!', 'success');
 
         } catch (\Exception $e) {
-
             DB::rollback();
             return admin_toastr($e->getMessage(), 'error');
         }