回收站恢复

app/crmAdmin/controller/CustomerController.php

@@ -176,19 +176,24 @@ class CustomerController extends BaseController
      */
     public function restore(Request $request)
     {
+        try {
             $id = $request->input('id', '');
             if (Util::isEmpty($id)) {
                 return $this->error(trans('id_empty'));
             }
-        $id = explode(',', $id);
+            $ids = explode(',', $id);
-        $query = Customer::whereIn('id', $id);
+            $query = Customer::withTrashed()->whereIn('id', $ids);
-        //$res = $query->restore();
+            if (!$query->exists()) {
-        $res = $query->update(['status' => 1, 'user_id' => 0]);
-        if($res){
-            return $this->success($res, trans('success'));
-        }else{
                 return $this->error(trans('fail'));
             }
+            // 恢复软删除（清空 deleted_at）
+            $query->restore();
+            // 恢复为在库状态，放入公海
+            $res = Customer::whereIn('id', $ids)->update(['status' => 1, 'user_id' => 0]);
+            return $this->success($res, trans('success'));
+        } catch (\Throwable $th) {
+            return $this->error($th->getMessage());
+        }
     }
 
     /**