Merge branch '0311_jobrecruiting_fr'

app/JsonRpc/UserService.php

@@ -76,6 +76,13 @@ class UserService implements UserServiceInterface
                 'administrative_unit_id' => $data['administrative_unit_id'] ?? 0,
                 'department_id' => $data['department_id'] ?? 0,
                 'department_arr_id' => $data['department_arr_id'] ?? '',
+                // 企业会员  相关    公司信息
+                'company_hy_id' => $data['company_hy_id']?? 0,
+                'company_size' => $data['company_size']?? 0,
+                'company_nature' => $data['company_nature']?? '',
+                'introduction' => $data['introduction']?? '',
+                'company_url' => $data['company_url']?? '',
+
             ];
             var_dump("UserINfo:::", $dataUserInfoReq);
 
@@ -193,6 +200,13 @@ class UserService implements UserServiceInterface
                 'user_info.legal_person_id_card',
                 'user_info.administrative_unit_arr_id',
                 'user_info.administrative_unit_id',
+                // 企业会员  相关    公司信息
+                'user_info.company_hy_id',
+                'user_info.company_size',
+                'user_info.company_nature',
+                'user_info.introduction',
+                'user_info.company_url',
+
                 'role_user.role_id',
                 'user_info.department_id',
                 'user_info.department_arr_id',
@@ -295,6 +309,13 @@ class UserService implements UserServiceInterface
                 'administrative_unit_id' => $data['administrative_unit_id'] ?? 0,
                 'department_id' => $data['department_id'] ?? 0,
                 'department_arr_id' => $data['department_arr_id'] ?? '',
+                 // 企业会员  相关    公司信息
+                'company_hy_id' => $data['company_hy_id']?? 0,
+                'company_size' => $data['company_size']?? 0,
+                'company_nature' => $data['company_nature']?? 0,
+                'introduction' => $data['introduction']?? '',
+                'company_url' => $data['company_url']?? '',
+
             ];
 
             $userInfoRep = UserInfo::where(['user_id' => $data['id']])->update($dataUserInfoReq);
@@ -309,9 +330,13 @@ class UserService implements UserServiceInterface
         } catch (\Throwable $ex) {
             Db::rollBack();
             var_dump($ex->getMessage());
-            return Result::error("创建失败", 0);
+            return Result::error("修改失败", 0);
         }
-        return Result::success([]);
+        $result = [
+            'user' => $userRep,
+            'userInfo' => $userInfoRep,
+        ];
+        return $result ? Result::success($result) : Result::error("修改失败", 0);
     }
 
     /**