1

app/JsonRpc/PublicRpcService.php

@@ -301,14 +301,14 @@ class PublicRpcService implements PublicRpcServiceInterface
      */
     public function delLetterOfComplaint(array $data): array
     {
-        $where = [
-            'id' => $data['id'],
-            'user_id' => $data['user_id'],
-        ];
-        if(isset($data['is_admin'])){
-            unset($where['user_id']);
-        }
-        $result = LetterOfComplaint::where($where)->delete();
+        $result = LetterOfComplaint::when($data,function ($query) use ($data){
+            if(isset($data['id']) && !empty($data['id'])){
+                $query->where(['id'=>$data['id']]);
+            }
+            if(isset($data['user_id']) && !empty($data['user_id'])){
+                $query->where(['user_id'=>$data['user_id']]);
+            }
+        })->delete();
         if (empty($result)) {
             return Result::error("删除失败", 0);
         } else {