合并分支 'master-server' 到 'master'

gx精准询盘验证邮箱



查看合并请求 !1326

@@ -39,6 +39,13 @@ class InquiryController extends BaseController
         $this->response('success',Code::SUCCESS,$data);
     }
 
+    /**
+     * @remark :精准询盘列表
+     * @name   :index
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/5 9:48
+     */
     public function index(InquiryLogic $logic)
     {
         if(!empty($this->param['form_id'])){
@@ -49,8 +56,7 @@ class InquiryController extends BaseController
             $data = $logic->getApiList();
         }
         if(!empty($data) && !empty($data['list'])){
-            $phone = [];
-            $email = [];
+            $email = $phone = [];
             foreach ($data['list'] as $v){
                 if(!empty($v['phone'])){
                     $phone[] = $v['phone'];
@@ -58,20 +64,20 @@ class InquiryController extends BaseController
                 if(!empty($v['email'])){
                     $email[] = $v['email'];
                 }
+            }
         }
         if(!empty($phone)){
-                $phoneDataModel = new PhoneData();
-                $phoneDataList = $phoneDataModel->list(['phone'=>['in',$phone]]);
-                foreach ($data['list'] as $key => $value){
-                    $value['phone_data'] = [];
-                    foreach ($phoneDataList as  $valuePhone){
-                        if($value['phone'] == $valuePhone['phone']){
-                            $value['phone_data'] = $valuePhone;
-                            break;
-                        }
+            $phoneDataModel = new PhoneData();
+            $phoneDataList = $phoneDataModel->list(['phone'=>['in',$phone]]);
+            foreach ($data['list'] as $key => $value){
+                $value['phone_data'] = [];
+                foreach ($phoneDataList as  $valuePhone){
+                    if($value['phone'] == $valuePhone['phone']){
+                        $value['phone_data'] = $valuePhone;
+                        break;
                     }
-                    $data['list'][$key] = $value;
                 }
+                $data['list'][$key] = $value;
             }
         }
         if(!empty($email)){