From 7c8a87ee25d0815c85bc7055e8ad934fa326bcec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com>
Date: Fri, 23 May 2025 17:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=A1=97=E9=81=93=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs   | 4 ++++
 .../ServiceApp/DroneSsnydManage/Request/DroneSnnyAppReq.cs | 2 ++
 .../DroneSsnydManage/Request/DroneSsnyAppPageReq.cs        | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs
index e719849..f6894b0 100644
--- a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs
+++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs
@@ -84,6 +84,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
             var totalCount = 0;
             var list = Repository.AsQueryable()
                 .Where(a => a.handle_status_id == 99)
+                .WhereIF(!string.IsNullOrEmpty(req.streetid), a => a.streetid == req.streetid)
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
                 .OrderBy(a => a.end_time, OrderByType.Desc)
@@ -105,6 +106,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
             var totalCount = 0;
             var list = Repository.AsQueryable()
                 .Where(a => a.handle_status_id != 99)
+                .WhereIF(!string.IsNullOrEmpty(req.streetid), a => a.streetid == req.streetid)
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
                 .OrderBy(a => a.end_time, OrderByType.Desc)
@@ -120,6 +122,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         {
             var list = Repository.AsQueryable()
                 .Where(a => a.handle_status_id == 99)
+                .WhereIF(!string.IsNullOrEmpty(req.streetid), a => a.streetid == req.streetid)
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmu_name.Contains(req.xiangmumc))
                 .Select(
@@ -149,6 +152,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
         {
             var list = Repository.AsQueryable()
                 .Where(a => a.handle_status_id != 99)
+                .WhereIF(!string.IsNullOrEmpty(req.streetid), a => a.streetid == req.streetid)
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
                 .WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmu_name.Contains(req.xiangmumc))
                 .Select(
diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSnnyAppReq.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSnnyAppReq.cs
index f1ee84d..d6a1174 100644
--- a/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSnnyAppReq.cs
+++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSnnyAppReq.cs
@@ -12,4 +12,6 @@ public class DroneSnnyAppReq
     /// 项目编号
     /// </summary>
     public string xiangmu_no { get; set; }
+    
+    public string streetid { get; set; }
 }
diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSsnyAppPageReq.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSsnyAppPageReq.cs
index 5589ae4..c01e2c7 100644
--- a/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSsnyAppPageReq.cs
+++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSsnyAppPageReq.cs
@@ -8,8 +8,15 @@ public class DroneSsnyAppPageReq : PageReq
     /// 项目名称
     /// </summary>
     public string xiangmu_name { get; set; }
+
     /// <summary>
     /// 项目编号
     /// </summary>
     public string xiangmu_no { get; set; }
+
+    /// <summary>
+    /// 街道id
+    /// </summary>
+    public string streetid { get; set; }
+
 }