diff --git a/app/Admin/Controllers/PersonController.php b/app/Admin/Controllers/PersonController.php index 09abff1..af1fad0 100644 --- a/app/Admin/Controllers/PersonController.php +++ b/app/Admin/Controllers/PersonController.php @@ -288,7 +288,7 @@ class PersonController extends AdminController 'visibleOn' => '${is_master > 0}', 'size' => 15 ]) - ->api(admin_url('persons?_action=getData&master[name]=${master.name}')) + ->api(admin_url('persons?_action=getData&state=1&master[name]=${master.name}')) ->columns([ amis()->TableColumn('name', __('admin.persons.name'))->copyable(), amis()->TableColumn('master_connect', __('admin.persons.master_connect')), @@ -572,7 +572,7 @@ class PersonController extends AdminController amis()->TableColumn('idcard', __('admin.persons.idcard')), amis()->TableColumn('master_connect', __('admin.persons.master_connect'))->width('60px'), amis()->RadioControl('is_new_master', '新户主')->disabledOn('is_master'), - amis()->TextControl('new_master_connect', '新关系')->disabledOn('is_master'), + amis()->TextControl('new_master_connect', '新关系'), ])->required() )->visibleOn('${is_master}'), amis()->Divider(), diff --git a/app/Services/Admin/PersonService.php b/app/Services/Admin/PersonService.php index 0b5f691..6f20ba4 100644 --- a/app/Services/Admin/PersonService.php +++ b/app/Services/Admin/PersonService.php @@ -556,14 +556,17 @@ class PersonService extends BaseService ]); } } - - Person::where('id', $person->id)->update([ + $personUpdate = [[ 'domicile_code' => '99999999', 'is_master' => 0, - 'master_id' => null, - 'master_connect' => null, 'state' => 2, - ]); + ]]; + if(isset($oldNewMaster)){ + $personUpdate['master_id'] = $oldNewMaster['id']; + $personUpdate['master_connect'] = $oldNewMaster['new_master_connect']; + } + + Person::where('id', $person->id)->update($personUpdate); count($personChangeLogs) > 0 && PersonChange::insert($personChangeLogs);