|
@@ -73,9 +73,9 @@ class DeptService
|
|
'dept_city' => $params['dept_city'],
|
|
'dept_city' => $params['dept_city'],
|
|
'dept_name' => $params['dept_name'],
|
|
'dept_name' => $params['dept_name'],
|
|
'dept_telephone' => $params['dept_telephone'],
|
|
'dept_telephone' => $params['dept_telephone'],
|
|
- 'dept_position' => $params['dept_position'],
|
|
|
|
- 'dept_address' => $params['dept_address'],
|
|
|
|
- 'dept_remark' => $params['dept_remark'],
|
|
|
|
|
|
+ 'dept_position' => $params['dept_position'] ?? '',
|
|
|
|
+ 'dept_address' => $params['dept_address'] ?? '',
|
|
|
|
+ 'dept_remark' => $params['dept_remark'] ?? '',
|
|
'dept_extend_json' => !empty($params['dept_extend_json']) ? $params['dept_extend_json'] : '{}',
|
|
'dept_extend_json' => !empty($params['dept_extend_json']) ? $params['dept_extend_json'] : '{}',
|
|
'dept_addtimes' => time()
|
|
'dept_addtimes' => time()
|
|
];
|
|
];
|
|
@@ -123,7 +123,7 @@ class DeptService
|
|
if ($dept->dept_super_id != $params['dept_super_id']) {
|
|
if ($dept->dept_super_id != $params['dept_super_id']) {
|
|
$deptSuperPath = SysDept::where('dept_id', $params['dept_super_id'])->value('dept_super_path');
|
|
$deptSuperPath = SysDept::where('dept_id', $params['dept_super_id'])->value('dept_super_path');
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ Db::beginTransaction();
|
|
try {
|
|
try {
|
|
$data = [
|
|
$data = [
|
|
'dept_status' => $params['dept_status'],
|
|
'dept_status' => $params['dept_status'],
|
|
@@ -132,9 +132,9 @@ class DeptService
|
|
'dept_city' => $params['dept_city'],
|
|
'dept_city' => $params['dept_city'],
|
|
'dept_name' => $params['dept_name'],
|
|
'dept_name' => $params['dept_name'],
|
|
'dept_telephone' => $params['dept_telephone'],
|
|
'dept_telephone' => $params['dept_telephone'],
|
|
- 'dept_position' => $params['dept_position'],
|
|
|
|
- 'dept_address' => $params['dept_address'],
|
|
|
|
- 'dept_remark' => $params['dept_remark'],
|
|
|
|
|
|
+ 'dept_position' => $params['dept_position'] ?? '',
|
|
|
|
+ 'dept_address' => $params['dept_address'] ?? '',
|
|
|
|
+ 'dept_remark' => $params['dept_remark'] ?? '',
|
|
'dept_extend_json' => !empty($params['dept_extend_json']) ? $params['dept_extend_json'] : '{}',
|
|
'dept_extend_json' => !empty($params['dept_extend_json']) ? $params['dept_extend_json'] : '{}',
|
|
];
|
|
];
|
|
// 上级变动,更新
|
|
// 上级变动,更新
|
|
@@ -146,7 +146,18 @@ class DeptService
|
|
if (!SysDept::where('dept_id', $id)->update($data)) {
|
|
if (!SysDept::where('dept_id', $id)->update($data)) {
|
|
throw new \Exception('修改部门失败');
|
|
throw new \Exception('修改部门失败');
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if ($dept->dept_super_id != $params['dept_super_id']) {
|
|
|
|
+ $subs = SysDept::getAllSubDept($dept->dept_super_path);
|
|
|
|
+ if ($subs) {
|
|
|
|
+ foreach ($subs as $sub) {
|
|
|
|
+ SysDept::where('dept_id', $sub['dept_id'])->update(['dept_super_path' => str_replace($dept->dept_super_path, $data['dept_super_path'], $sub['dept_super_path'])]);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ Db::commit();
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
|
|
+ Db::rollBack();
|
|
return json_fail('修改部门失败');
|
|
return json_fail('修改部门失败');
|
|
}
|
|
}
|
|
|
|
|