提交

application/common/service/DingtalkService.php

@@ -208,18 +208,13 @@ class DingtalkService
                 Department::insertAll($add_department_data);
             }
             if ($del_department_data) {
-                Department::where('id', 'in', $del_department_data)->delete();
+                Department::where('id', 'in', $del_department_data)->update(['is_deleted'=>CommonConstant::IS_DELETED_1]);
             }
 
             // 更新员工
             foreach ($user_data as $value) {
                 if (array_key_exists($value['userid'], $user_key)) {
-                    $data = [
-                        'userid' => $value['userid'],
-                        'unionid' => $value['unionid'],
-                        'department' => implode(',', $value['dept_id_list']),
-                    ];
-                    $save_user_data[] = $data;
+                    $save_user_data[] = $value;
                 } else {
                     $data = [
                         'userid' => $value['userid'],
@@ -238,7 +233,12 @@ class DingtalkService
                 foreach ($user_list as $val) {
                     if (array_key_exists($val['userid'], $user_data_key)) {
                         $user_data_info = $user_data_key[$val['userid']];
-                        $val->save($user_data_info);
+                        $data = [
+                            'userid' => $user_data_info['userid'],
+                            'unionid' => $user_data_info['unionid'],
+                            'department' => implode(',', $user_data_info['dept_id_list']),
+                        ];
+                        $val->save($data);
                     } else {
                         $del_user_data[] = $val['id'];
                     }
@@ -248,8 +248,9 @@ class DingtalkService
                 User::insertAll($add_user_data);
             }
             if ($del_user_data) {
-                User::where('id', 'in', $del_user_data)->delete();
+                User::where('id', 'in', $del_user_data)->update(['is_deleted'=>CommonConstant::IS_DELETED_1]);
             }
+            Db::commit();
         } catch (Exception $e) {
             Db::rollback();
             except('出现错误：' . $e->getMessage());