|
|
@@ -74,6 +74,8 @@ class UserService implements UserServiceInterface
|
|
|
'legal_person_id_card' => $data['legal_person_id_card'] ?? '',
|
|
|
'administrative_unit_arr_id' => $data['administrative_unit_arr_id'] ?? '',
|
|
|
'administrative_unit_id' => $data['administrative_unit_id'] ?? 0,
|
|
|
+ 'department_id' => $data['department_id'] ?? 0,
|
|
|
+ 'department_arr_id' => $data['department_arr_id'] ?? '',
|
|
|
];
|
|
|
var_dump("UserINfo:::", $dataUserInfoReq);
|
|
|
|
|
|
@@ -192,6 +194,8 @@ class UserService implements UserServiceInterface
|
|
|
'user_info.administrative_unit_arr_id',
|
|
|
'user_info.administrative_unit_id',
|
|
|
'role_user.role_id',
|
|
|
+ 'user_info.department_id',
|
|
|
+ 'user_info.department_arr_id',
|
|
|
|
|
|
)
|
|
|
->where('user.id', '=', $id)->first();
|
|
|
@@ -241,6 +245,7 @@ class UserService implements UserServiceInterface
|
|
|
*/
|
|
|
public function updateUser(array $data): array
|
|
|
{
|
|
|
+ var_dump($data, "----------------------");
|
|
|
Db::beginTransaction();
|
|
|
try {
|
|
|
$userInfos = User::where(['id' => $data['id']])->first(); //查询用户昵称
|
|
|
@@ -288,6 +293,8 @@ class UserService implements UserServiceInterface
|
|
|
'legal_person_id_card' => $data['legal_person_id_card'] ?? '',
|
|
|
'administrative_unit_arr_id' => $data['administrative_unit_arr_id'] ?? '',
|
|
|
'administrative_unit_id' => $data['administrative_unit_id'] ?? 0,
|
|
|
+ 'department_id' => $data['department_id'] ?? 0,
|
|
|
+ 'department_arr_id' => $data['department_arr_id'] ?? '',
|
|
|
];
|
|
|
|
|
|
$userInfoRep = UserInfo::where(['user_id' => $data['id']])->update($dataUserInfoReq);
|
|
|
@@ -585,7 +592,7 @@ class UserService implements UserServiceInterface
|
|
|
*/
|
|
|
public function getWebsiteGroupInfo(array $data): array
|
|
|
{
|
|
|
- $result = WebsiteGroup::where(['id'=>$data['id']])->first();
|
|
|
+ $result = WebsiteGroup::where(['id' => $data['id']])->first();
|
|
|
if ($result) {
|
|
|
return Result::success($result);
|
|
|
} else {
|
