From 8788707a4a92697219877816ab52d02db8938d92 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 2 Jul 2024 11:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/user_ship/UserShip.php | 13 +++++++++++++
 app/store/lists/user/UserLists.php      | 13 +++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 app/common/model/user_ship/UserShip.php

diff --git a/app/common/model/user_ship/UserShip.php b/app/common/model/user_ship/UserShip.php
new file mode 100644
index 000000000..1cfc60f27
--- /dev/null
+++ b/app/common/model/user_ship/UserShip.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace app\common\model\user_ship;
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+class UserShip extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'user_ship';
+    protected $deleteTime = 'delete_time';
+}
\ No newline at end of file
diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php
index 2a193332b..91a532214 100644
--- a/app/store/lists/user/UserLists.php
+++ b/app/store/lists/user/UserLists.php
@@ -8,8 +8,9 @@ use app\common\model\store_finance_flow\StoreFinanceFlow;
 use app\common\model\user_sign\UserSign;
 use app\store\lists\BaseAdminDataLists;
 use app\common\model\user\User;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\user\UserAddress;
 
 class UserLists extends BaseAdminDataLists  implements ListsSearchInterface
 {
@@ -38,7 +39,15 @@ class UserLists extends BaseAdminDataLists  implements ListsSearchInterface
      */
     public function lists(): array
     {
-
+        $street=$this->request->get('street','');
+        if($street){
+            $uid=UserAddress::where('street',$street)->group('uid')->column('uid');
+            if($uid){
+                $this->searchWhere[]=['id','in',$uid];
+            }else{
+                return [];
+            }
+        }
         $field = "id,nickname,real_name,sex,avatar,account,mobile,now_money,user_ship,create_time,purchase_funds,integral";
         $lists = User::where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)