Browse Source

修改 bug

master
王泽彦 8 months ago
parent
commit
f8b2205e43
  1. 4
      niucloud/app/adminapi/controller/personnel/Personnel.php
  2. 4
      niucloud/app/service/admin/personnel/PersonnelService.php

4
niucloud/app/adminapi/controller/personnel/Personnel.php

@ -72,7 +72,7 @@ class Personnel extends BaseAdminController
["use_approval", 0], // 是否使用审批流程 ["use_approval", 0], // 是否使用审批流程
["approval_config_id", 0], // 审批配置ID ["approval_config_id", 0], // 审批配置ID
]); ]);
$this->validate($data, 'app\validate\personnel\Personnel.add'); // $this->validate($data, 'app\validate\personnel\Personnel.add');
// 检查是否使用审批流程 // 检查是否使用审批流程
if ($data['use_approval'] && $data['approval_config_id'] > 0) { if ($data['use_approval'] && $data['approval_config_id'] > 0) {
@ -114,7 +114,7 @@ class Personnel extends BaseAdminController
["info",[]], ["info",[]],
]); ]);
$this->validate($data, 'app\validate\personnel\Personnel.edit'); // $this->validate($data, 'app\validate\personnel\Personnel.edit');
(new PersonnelService())->edit($id, $data); (new PersonnelService())->edit($id, $data);
return success('EDIT_SUCCESS'); return success('EDIT_SUCCESS');
} }

4
niucloud/app/service/admin/personnel/PersonnelService.php

@ -122,6 +122,10 @@ class PersonnelService extends BaseAdminService
} }
// 员工编号 // 员工编号
$data['employee_number'] = getEmployeeNumber(); $data['employee_number'] = getEmployeeNumber();
$data['birthday'] = $info['birthday'];
$data['native_place'] = $info['native_place'];
unset($info['birthday']);
unset($info['native_place']);
$res = $this->model->create($data); $res = $this->model->create($data);
$info['person_id'] = $res->id; $info['person_id'] = $res->id;

Loading…
Cancel
Save