|
|
@@ -216,16 +216,26 @@ class EmployeeService extends Service
|
|
|
public function employeeDel($data){
|
|
|
if($this->isEmpty($data,'id')) return [false,'请选择删除的数据!'];
|
|
|
|
|
|
- Employee::whereIn('id',$data['id'])->update([
|
|
|
- 'del_time'=>time()
|
|
|
- ]);
|
|
|
- EmployeeRole::where('del_time',0)->whereIn('employee_id',$data['id'])->update([
|
|
|
- 'del_time'=>time()
|
|
|
- ]);
|
|
|
- EmployeeDepartPermission::whereIn('employee_id',$data['id'])->delete();
|
|
|
- EmployeeWorkRange::whereIn('employee_id',$data['id'])->delete();
|
|
|
+ try {
|
|
|
+ DB::beginTransaction();
|
|
|
+ $time = time();
|
|
|
+
|
|
|
+ Employee::whereIn('id',$data['id'])->update([
|
|
|
+ 'del_time'=>$time
|
|
|
+ ]);
|
|
|
+ EmployeeRole::where('del_time',0)->whereIn('employee_id',$data['id'])->update([
|
|
|
+ 'del_time'=>$time
|
|
|
+ ]);
|
|
|
+ EmployeeDepartPermission::whereIn('employee_id',$data['id'])->delete();
|
|
|
+ EmployeeWorkRange::whereIn('employee_id',$data['id'])->delete();
|
|
|
+
|
|
|
+ DB::commit();
|
|
|
+ }catch (\Exception $exception){
|
|
|
+ DB::rollBack();
|
|
|
+ return [false,$exception->getMessage()];
|
|
|
+ }
|
|
|
|
|
|
- return [true,'删除成功'];
|
|
|
+ return [true, ''];
|
|
|
}
|
|
|
|
|
|
public function employeeDetail($data, $user){
|
|
|
@@ -647,17 +657,27 @@ class EmployeeService extends Service
|
|
|
->exists();
|
|
|
if($bool) return [false,'角色已绑定人员'];
|
|
|
|
|
|
- Role::where('id',$data['id'])->update([
|
|
|
- 'del_time' => time()
|
|
|
- ]);
|
|
|
+ try {
|
|
|
+ DB::beginTransaction();
|
|
|
+ $time = time();
|
|
|
|
|
|
- RoleMenu::where('del_time',0)->where('role_id',$data['id'])->update([
|
|
|
- 'del_time' => time()
|
|
|
- ]);
|
|
|
+ Role::where('id',$data['id'])->update([
|
|
|
+ 'del_time' => $time
|
|
|
+ ]);
|
|
|
|
|
|
- RoleMenuButton::where('del_time',0)->where('role_id',$data['id'])->update([
|
|
|
- 'del_time' => time()
|
|
|
- ]);
|
|
|
+ RoleMenu::where('del_time',0)->where('role_id',$data['id'])->update([
|
|
|
+ 'del_time' => $time
|
|
|
+ ]);
|
|
|
+
|
|
|
+ RoleMenuButton::where('del_time',0)->where('role_id',$data['id'])->update([
|
|
|
+ 'del_time' => $time
|
|
|
+ ]);
|
|
|
+
|
|
|
+ DB::commit();
|
|
|
+ }catch (\Exception $exception){
|
|
|
+ DB::rollBack();
|
|
|
+ return [false,$exception->getMessage()];
|
|
|
+ }
|
|
|
|
|
|
return [true, ''];
|
|
|
}
|