From 3e77d71e944748d58a9774a4cd548b3b7031715c Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Tue, 4 Nov 2025 09:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E5=92=8C=E8=A7=A3?=
 =?UTF-8?q?=E9=94=81=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/receiver/Clues.php              | 2 +-
 agent/admin/controllers/pingan/receiver/Clues.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin/controllers/receiver/Clues.php b/admin/controllers/receiver/Clues.php
index 1eb7bbc1..c8acf06c 100644
--- a/admin/controllers/receiver/Clues.php
+++ b/admin/controllers/receiver/Clues.php
@@ -263,7 +263,7 @@ class Clues extends HD_Controller
                 }
                 $val['rec_time'] = $val['rec_time'] != '0000-00-00 00:00:00' ? $val['rec_time'] : '';
                 $is_unlock = '';
-                if ($val['app_id'] == Receiver_clues_model::APP_ID_ACTIVITY && $val['status'] > 0) {
+                if ($val['app_id'] == Receiver_clues_model::APP_ID_ACTIVITY && $val['status'] == 1) {
                     $unlockCustomer = $this->customers_model->get(['rid' => $val['id'], 'un_lock' => Receiver_customers_model::LOCK_STATUS]);
                     $is_unlock = $unlockCustomer ? '已解锁' : '未解锁';
                 }
diff --git a/agent/admin/controllers/pingan/receiver/Clues.php b/agent/admin/controllers/pingan/receiver/Clues.php
index d0fb4a12..b6daf746 100644
--- a/agent/admin/controllers/pingan/receiver/Clues.php
+++ b/agent/admin/controllers/pingan/receiver/Clues.php
@@ -382,6 +382,7 @@ class Clues extends BaseController
                 $belongUserName = $users[$v['pingan_user_id']] ? $users[$v['pingan_user_id']][0] : '';
                 $brandList = $this->receiver_enroll_model->getBrandsByMobile($v['mobile']);
                 $poi = '';
+                $area = '';
                 if ($v['county_id']) {
                     $area = $map_area_county[$v['county_id']][0];
                     $poi = "{$area['province_name']}-{$area['city_name']}-{$area['county_name']}";
@@ -400,7 +401,8 @@ class Clues extends BaseController
                         'centerNumber' => $belongUserName['centerNumber'] ? Pingan_users_model::TYPE_CENTER[$belongUserName['centerNumber']] : '',
                         'orgName' => $belongUserName['orgName'] ?: '',
                         'brandList' => implode(',', $brandList),
-                        'poi' => $poi,
+                        'provinceName' => $area['province_name'] ?: '',
+                        'cityName' => $area['city_name'] ?: '',
                         'statusCn' => $status_name,
                         'isUnlock' => $is_unlock,
                         'enTime' => $v['en_time'],
@@ -424,7 +426,7 @@ class Clues extends BaseController
         }
         $columns = [];
         if ($limit >= 10000) {
-            $columns = ['姓名', '手机号', '订单编号', '归属', '中心', '机构', '关注车型','所属地区', '状态', '是否解锁', '入池时间'];
+            $columns = ['姓名', '手机号', '订单编号', '归属', '中心', '机构', '关注车型', '所属省', '所属市', '状态', '是否解锁', '入池时间'];
         }
         return ['list' => $list, 'count' => $count, 'statusList' => $statusList, 'columns' => $columns];
     }