|
|
@@ -387,10 +387,11 @@ class User extends BaseController
|
|
387
|
387
|
|
|
388
|
388
|
$this->repository->update($id, $data);
|
|
389
|
389
|
|
|
390
|
|
- $originatorIdOld = request()->post('originator_id_old');
|
|
391
|
|
- if ($originatorIdOld !== null) {
|
|
392
|
|
- Db::name('user')->where('uid', $id)->update(['originator_id_old' => $originatorIdOld]);
|
|
|
390
|
+ $originatorIdOld = request()->post('originator_id_old','');//接收originator_id_old数据,并更新到数据库里
|
|
|
391
|
+ if ($originatorIdOld === '') {
|
|
|
392
|
+ $originatorIdOld = null;
|
|
393
|
393
|
}
|
|
|
394
|
+ Db::name('user')->where('uid', $id)->update(['originator_id_old' => $originatorIdOld]);
|
|
394
|
395
|
|
|
395
|
396
|
//更新身份证信息
|
|
396
|
397
|
$cardData = [];
|
|
|
@@ -422,14 +423,12 @@ class User extends BaseController
|
|
422
|
423
|
$user_rich_ypdate['uid']=$id;
|
|
423
|
424
|
Db::name('user_rich')->insert($user_rich_ypdate);
|
|
424
|
425
|
}
|
|
425
|
|
- $user = Db::name('user')->where('uid', $id)->find();
|
|
426
|
|
- return app('json')->success($user);
|
|
427
|
|
-
|
|
428
|
|
-
|
|
429
|
|
-
|
|
430
|
426
|
|
|
431
|
|
-
|
|
432
|
|
- return app('json')->success('编辑成功');
|
|
|
427
|
+ $user = Db::name('user')->where('uid', $id)->find();
|
|
|
428
|
+ if (isset($user['originator_id_old']) && is_null($user['originator_id_old'])) {
|
|
|
429
|
+ $user['originator_id_old'] = '';
|
|
|
430
|
+ }
|
|
|
431
|
+ return app('json')->success('编辑成功',$user);
|
|
433
|
432
|
}
|
|
434
|
433
|
|
|
435
|
434
|
public function maker_check_phone($id)
|