瀏覽代碼

Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/news_producer

LiuJ 4 月之前
父節點
當前提交
d0a2db3179

+ 21 - 28
app/JsonRpc/NewsService.php

@@ -4943,6 +4943,7 @@ class NewsService implements NewsServiceInterface
     * */
   public function addJobRecruiting(array $data): array
   {
+    // var_dump('添加招聘进入news------data',$data);
     // return Result::success($data);
     $user = User::where('user.id', $data['user_id'])
       ->where('user.status', 1)
@@ -4969,16 +4970,17 @@ class NewsService implements NewsServiceInterface
     if (empty($web)) {
       return Result::error("网站不存在", 0);
     }
+    // var_dump('添加招聘进入news---user---user',$user);
     // return Result::success($user);
-    $data['action_id'] = $data['user_id'];
-    $data['user_type'] = $user['type_id'];
-    $data['cat_arr_id'] = array_values(array_unique($data['cat_arr_id']));
-    $data['city_arr_id'] = array_values(array_unique($data['city_arr_id']));
-    $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode(array_map('intval', $data['cat_arr_id'])) : '';
-    $data['city_arr_id'] = isset($data['city_arr_id']) ? json_encode(array_map('intval', $data['city_arr_id'])) : '';
+    $data['action_id'] = $data['user_id'] ?? null;
+    $data['user_type'] = $user['type_id'] ?? null;
+    $data['cat_arr_id'] = isset($data['cat_arr_id']) && !empty($data['cat_arr_id']) ? array_values(array_unique($data['cat_arr_id'])) : [];
+    $data['city_arr_id'] = isset($data['city_arr_id']) && !empty($data['city_arr_id']) ? array_values(array_unique($data['city_arr_id'])) : [];
+    $data['cat_arr_id'] = isset($data['cat_arr_id']) && $data['cat_arr_id'] != [] ? json_encode(array_map('intval', $data['cat_arr_id'])) : '[]';
+    $data['city_arr_id'] = isset($data['city_arr_id']) && !empty($data['city_arr_id']) ? json_encode(array_map('intval', $data['city_arr_id'])) : '[]';
     // 公司地址 管理员必填
-    $data['address_arr_id'] = array_values(array_unique($data['address_arr_id']));
-    $data['address_arr_id'] = isset($data['address_arr_id']) ? json_encode(array_map('intval', $data['address_arr_id'])) : '';
+    $data['address_arr_id'] = isset($data['address_arr_id']) && !empty($data['address_arr_id']) ? array_values(array_unique($data['address_arr_id'])) : [];
+    $data['address_arr_id'] = isset($data['address_arr_id']) && $data['address_arr_id'] != [] ? json_encode(array_map('intval', $data['address_arr_id'])) : '[]';
     // 管理员-企业相关信息
     $company = [
       // 'user_id' => $data['user_id']?? null,
@@ -4994,11 +4996,12 @@ class NewsService implements NewsServiceInterface
       'address' => isset($data['address']) && $data['address'] !== '' ? $data['address'] : null,
       'email' => isset($data['email']) && $data['email'] !== '' ? $data['email'] : null,
     ];
-    //去掉相关企业信息 
+    //去掉相关企业信息
     $job = array_diff_key($data, array_flip(array_keys($company)));
+    // var_dump('添加招聘进入news---job---user',$job);
     Db::beginTransaction();
     try {
-      // 先添加职位相关信息
+      //     // 先添加职位相关信息
       if ($user['type_id'] == 10000) {
         $job['status'] = 1;
       }
@@ -5009,34 +5012,28 @@ class NewsService implements NewsServiceInterface
       $job['level'] = isset($data['level']) && $data['level'] !== '' ? $data['level'] : null;
       $job['job_level'] = isset($data['job_level']) && $data['job_level'] !== '' ? $data['job_level'] : null;
       $job['educational'] = isset($data['educational']) && $data['educational'] !== '' ? $data['educational'] : null;
-      if ((isset($data['status']) && $data['status'] == 0) || !isset($data['status'])) {
-        $this->sendMessage([
-          'talk_type' => 500,
-          'title' => $data['title'],
-          'content' => '提交了审核',
-          'messageType' => 10,
-        ]);
-      }
+
+      // return Result::success($job);
       $jobId = JobRecruiting::insertGetId($job);
       if (empty($jobId)) {
         Db::rollBack();
         return Result::error("添加失败");
       }
+
       // 添加公司信息
-      $company['user_id'] = $data['user_id'] ?? null;
+      $company['user_id'] = isset($data['user_id']) && $data['user_id'] !== '' ? $data['user_id'] : null;
       $company['job_id'] = $jobId;
-      $company['user_type'] = $user['type_id'] ?? null;
-      $company['website_id'] = $data['website_id'] ?? null;
+      $company['user_type'] = isset($user['type_id']) && $user['type_id'] !== '' ? $user['type_id'] : null;
+      $company['website_id'] = isset($data['website_id']) && $data['website_id'] !== '' ? $data['website_id'] : null;
       if ($user['type_id'] == 10000) {
         // 管理员添加企业信息
-        //    return Result::success($company);
         $companyId = JobCompany::insertGetId($company);
         if (empty($companyId)) {
           Db::rollBack();
           return Result::error("添加失败");
         }
       } else {
-        // 企业会员添加企业信息
+        // 企业会员添加企业信息   
         $company['user_id'] = isset($data['user_id']) && $data['user_id'] !== '' ? $data['user_id'] : null;
         $company['website_id'] = isset($data['website_id']) && $data['website_id'] !== '' ? $data['website_id'] : null;
         $company['user_type'] = isset($data['user_type']) && $data['user_type'] !== '' ? $data['user_type'] : null;
@@ -5046,22 +5043,18 @@ class NewsService implements NewsServiceInterface
           Db::rollBack();
           return Result::error("添加失败");
         }
-        // return Result::success($company);
       }
       Db::commit();
-      $companyId = JobCompany::insertGetId($company);
       $result = [
         'job_id' => $jobId,
         'company_id' => $companyId,
       ];
-      if (empty($result)) {
-        return Result::error("添加失败", 0);
-      }
       return Result::success($result);
     } catch (\Exception $e) {
       Db::rollBack();
       return Result::error($e->getMessage(), 0);
     }
+    // return Result::success($result);
   }
   /*
     * 获取招聘信息详情

文件差異過大導致無法顯示
+ 0 - 0
runtime/container/scan.cache


+ 1 - 1
runtime/hyperf.pid

@@ -1 +1 @@
-48391
+72088

+ 2 - 0
vendor/composer/autoload_classmap.php

@@ -26,6 +26,7 @@ return array(
     'App\\Model\\ChatGroupsMember' => $baseDir . '/app/Model/ChatGroupsMember.php',
     'App\\Model\\ChatRecords' => $baseDir . '/app/Model/ChatRecords.php',
     'App\\Model\\Company' => $baseDir . '/app/Model/Company.php',
+    'App\\Model\\Complaint' => $baseDir . '/app/Model/Complaint.php',
     'App\\Model\\Couplet' => $baseDir . '/app/Model/Couplet.php',
     'App\\Model\\District' => $baseDir . '/app/Model/District.php',
     'App\\Model\\Festival' => $baseDir . '/app/Model/Festival.php',
@@ -789,6 +790,7 @@ return array(
     'Hyperf\\Coordinator\\CoordinatorManager' => $vendorDir . '/hyperf/coordinator/src/CoordinatorManager.php',
     'Hyperf\\Coordinator\\Listener\\ResumeExitCoordinatorListener' => $vendorDir . '/hyperf/coordinator/src/Listener/ResumeExitCoordinatorListener.php',
     'Hyperf\\Coordinator\\Timer' => $vendorDir . '/hyperf/coordinator/src/Timer.php',
+    'Hyperf\\Coroutine\\Barrier' => $vendorDir . '/hyperf/coroutine/src/Barrier.php',
     'Hyperf\\Coroutine\\Channel\\Caller' => $vendorDir . '/hyperf/coroutine/src/Channel/Caller.php',
     'Hyperf\\Coroutine\\Channel\\Manager' => $vendorDir . '/hyperf/coroutine/src/Channel/Manager.php',
     'Hyperf\\Coroutine\\Channel\\Pool' => $vendorDir . '/hyperf/coroutine/src/Channel/Pool.php',

+ 2 - 0
vendor/composer/autoload_static.php

@@ -801,6 +801,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'App\\Model\\ChatGroupsMember' => __DIR__ . '/../..' . '/app/Model/ChatGroupsMember.php',
         'App\\Model\\ChatRecords' => __DIR__ . '/../..' . '/app/Model/ChatRecords.php',
         'App\\Model\\Company' => __DIR__ . '/../..' . '/app/Model/Company.php',
+        'App\\Model\\Complaint' => __DIR__ . '/../..' . '/app/Model/Complaint.php',
         'App\\Model\\Couplet' => __DIR__ . '/../..' . '/app/Model/Couplet.php',
         'App\\Model\\District' => __DIR__ . '/../..' . '/app/Model/District.php',
         'App\\Model\\Festival' => __DIR__ . '/../..' . '/app/Model/Festival.php',
@@ -1564,6 +1565,7 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'Hyperf\\Coordinator\\CoordinatorManager' => __DIR__ . '/..' . '/hyperf/coordinator/src/CoordinatorManager.php',
         'Hyperf\\Coordinator\\Listener\\ResumeExitCoordinatorListener' => __DIR__ . '/..' . '/hyperf/coordinator/src/Listener/ResumeExitCoordinatorListener.php',
         'Hyperf\\Coordinator\\Timer' => __DIR__ . '/..' . '/hyperf/coordinator/src/Timer.php',
+        'Hyperf\\Coroutine\\Barrier' => __DIR__ . '/..' . '/hyperf/coroutine/src/Barrier.php',
         'Hyperf\\Coroutine\\Channel\\Caller' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Caller.php',
         'Hyperf\\Coroutine\\Channel\\Manager' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Manager.php',
         'Hyperf\\Coroutine\\Channel\\Pool' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Pool.php',

部分文件因文件數量過多而無法顯示