From 044049dffd23c8ae53ee29502e4c88ba0cf8ae8f Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Thu, 6 Nov 2025 11:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E7=BA=BF?=
 =?UTF-8?q?=E7=B4=A2=E5=9F=8E=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/pingan/receiver/Clues.php     | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/agent/admin/controllers/pingan/receiver/Clues.php b/agent/admin/controllers/pingan/receiver/Clues.php
index 2cce9c8d..73adb06f 100644
--- a/agent/admin/controllers/pingan/receiver/Clues.php
+++ b/agent/admin/controllers/pingan/receiver/Clues.php
@@ -372,12 +372,23 @@ class Clues extends BaseController
             $rows = $this->clues_model->select($where, $sort_order, $page, $limit);
             $users = $this->pingan_users_model->get_map_by_ids(array_column($rows, 'pingan_user_id'), 'id,userCode,username,centerNumber,orgName');
             //所在地区
-            $map_area_county = [];
             $county_id_arr = array_filter(array_unique(array_column($rows, 'county_id')));
             if ($county_id_arr) {
                 $str_ids = implode(',', $county_id_arr);
                 $map_area_county = $this->area_model->map('county_id', '', ["county_id in ({$str_ids})" => null], '', 0, 0, 'county_id,province_name,city_name,county_name');
             }
+
+            $city_id_arr = array_filter(array_unique(array_column($rows, 'city_id')));
+            if ($city_id_arr) {
+                $str_ids = implode(',', $city_id_arr);
+                $map_area_city = $this->area_model->map('city_id', '', ["city_id in ({$str_ids})" => null], '', 0, 0, 'city_id,province_name,city_name');
+            }
+
+            $province_id_arr = array_filter(array_unique(array_column($rows, 'province_id')));
+            if ($province_id_arr) {
+                $str_ids = implode(',', $province_id_arr);
+                $map_area_province = $this->area_model->map('province_id', '', ["province_id in ({$str_ids})" => null], '', 0, 0, 'province_id,province_name');
+            }
             foreach ($rows as $v) {
                 $belongUserName = $users[$v['pingan_user_id']] ? $users[$v['pingan_user_id']][0] : '';
                 $brandList = $this->receiver_enroll_model->getBrandsByMobile($v['mobile']);
@@ -385,7 +396,13 @@ class Clues extends BaseController
                 $area = '';
                 if ($v['county_id']) {
                     $area = $map_area_county[$v['county_id']][0];
-                    $poi = "{$area['province_name']}-{$area['city_name']}-{$area['county_name']}";
+                    $v['poi'] = "{$area['province_name']}-{$area['city_name']}-{$area['county_name']}";
+                } elseif ($v['city_id']) {
+                    $area = $map_area_city[$v['city_id']][0];
+                    $v['poi'] = "{$area['province_name']}-{$area['city_name']}";
+                } elseif ($v['province_id']) {
+                    $area = $map_area_province[$v['province_id']][0];
+                    $v['poi'] = "{$area['province_name']}";
                 }
                 $status_name = $statusAry[$v['status']]['name'];
                 $v['status2'] && $status_name .= '‒' . $statusAry[$v['status']]['list'][$v['status2']];