[智价云] 员工删除日志更新

app/Http/Controllers/Manager/Personnel/Employee.php

@@ -538,17 +538,17 @@ class Employee extends Controller
             $where['company_id'] = $admin_company_id;
         }
         // 执行删除
-        $Employee = $EmployeeModel->where($where)->first();
-        if (!$Employee) {
+        $employee_info = $EmployeeModel->where($where)->first();
+        if (!$employee_info) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
         }
-        if ($is_admin == 0 && $admin_id == $Employee->id) {
+        if ($is_admin == 0 && $admin_id == $employee_info->id) {
             return json_send(['code' => 'error', 'msg' => '不能删除自己']);
         }
-        $old_user_data = $Employee->toArray();
+        $old_user_data = $employee_info->toArray();
         DB::beginTransaction();
         try {
-            $result = $Employee->delete();
+            $employee_info->delete();
             //查询用户绑定地区
             $user_city_totle = $EmployeeAreaModel->where(['employee_id' => $id])->count();
             if ($user_city_totle > 0) {
@@ -582,14 +582,14 @@ class Employee extends Controller
             // 记录行为
             $table_name = $EmployeeModel->getTable();
             $notes_type = 3; //操作类型，1添加，2修改，3=删除
-            $this->addAdminHistory('人员信息管理-员工管理', $admin_id, $is_admin, $table_name, $notes_type, $old_user_data, [], '删除了员工' . $old_user_data['name'] . '信息');
+            $this->addAdminHistory('人员信息管理-员工管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $old_user_data, [], '删除了员工' . $old_user_data['name'] . '信息');
             DB::commit();
             // 告知结果
             return             json_send(['code' => 'success', 'msg' => '删除成功']);
         } catch (\Exception $e) {
             DB::rollBack();
             // 提示删除失败
-            if (!$result)    return json_send(['code' => 'error', 'msg' => '删除失败', 'data' => $e->getMessage()]);
+            return json_send(['code' => 'error', 'msg' => '删除失败', 'data' => $e->getMessage()]);
         }
     }