From e6a00ed315041df27b626395c7afd2b191545449 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Tue, 1 Apr 2025 15:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=82=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs     | 8 ++++++--
 .../FireManagement/FireGridController.cs                  | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs b/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs
index 2c604c0..8537671 100644
--- a/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs
+++ b/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs
@@ -75,15 +75,19 @@ namespace OpenAuth.App.ServiceApp.FireManagement
             }
         }
         //查询打卡点
-        public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(string pointName, int pageIndex, int pageSize)
+        public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(long areaid, string pointName, int pageIndex, int pageSize)
         {
             using (SugarDbContext db = base.UnitWork.CreateContext())
             {
+                var chileorg = (await db.SysOrg.AsQueryable().ToChildListAsync(it => it.ParentId, areaid)).Select(it => it.Id).ToList();
+
                 RefAsync<int> totalNumber = 0;
                 var query = await db.FmCheckInPoint.AsQueryable()
                     .LeftJoin<SysUser>((a, b) => a.CreateId == b.Id)
+                    .LeftJoin<FmCheckArea>((a, b, c) => a.Id == c.PointId)
                     .Where((a, b) => a.IsDelete == false)
-                    .WhereIF(!string.IsNullOrEmpty(pointName), (a, b) => a.PointName.Contains(pointName))
+                    .WhereIF(!string.IsNullOrEmpty(pointName), (a, b, c) => a.PointName.Contains(pointName))
+                    .WhereIF(areaid != 0, (a, b, c) => chileorg.Contains(c.AreaId))
                     .Select<dynamic>((a, b) => new
                     {
                         a.Id,
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs
index f7e4d76..3d39756 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs
@@ -50,12 +50,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// <param name="limit"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(string pointName, int page, int limit)
+        public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(long areaid,string pointName, int page, int limit)
         {
             Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>();
             try
             {
-                return await _app.GetCheckPointList(pointName, page, limit);
+                return await _app.GetCheckPointList(areaid,pointName, page, limit);
             }
             catch (Exception ex)
             {