update 片区管理 项目管理

Api/Ewide.Application/Ewide.Application.xml

@@ -807,6 +807,13 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Ewide.Application.Service.HouseZoneService.QueryZonePageList(Ewide.Core.Service.PageOrgInput)">
+            <summary>
+            分页查询片区
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:Ewide.Application.Service.HouseZoneService.GetZoneByUser(System.String)">
             <summary>
             根据用户Id获取所在片区的Id

Api/Ewide.Application/Service/HouseSafety/HouseZone/HouseZoneService.cs

@@ -1,4 +1,5 @@
 using Ewide.Core;
+using Ewide.Core.Extension;
 using Ewide.Core.Service;
 using Furion.DatabaseAccessor;
 using Furion.DependencyInjection;
@@ -61,6 +62,32 @@ namespace Ewide.Application.Service
                 .ToListAsync();
         }
 
+        /// <summary>
+        /// 分页查询片区
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseZone/page")]
+        public async Task<dynamic> QueryZonePageList([FromBody] PageOrgInput input)
+        {
+            var dataScopeList = _sysOrgService.GetDataScopeList(await _sysOrgService.GetUserDataScopeIdList());
+
+            var name = !string.IsNullOrEmpty(input.Name?.Trim());
+            var id = !string.IsNullOrEmpty(input.Id?.Trim());
+            var pId = !string.IsNullOrEmpty(input.Pid?.Trim());
+            var orgs = await _sysOrgRep.DetachedEntities
+                                       .Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")), // 根据机构名称模糊查询
+                                              (id, u => u.Id == input.Id.Trim()), // 根据机构id查询
+                                              (pId, u => EF.Functions.Like(u.Pids, $"%[{input.Pid.Trim()}]%")
+                                                         || u.Id == input.Pid.Trim())) // 根据父机构id查询
+                                       .Where(dataScopeList.Count > 0, u => dataScopeList.Contains(u.Id)) // 非管理员范围限制
+                                       .Where(u => u.Status != CommonStatus.DELETED)
+                                       .Where(u => u.Type == (int)OrgType.片区)
+                                       .OrderBy(u => u.Sort)
+                                       .ToPageData<SysOrg, OrgOutput>(input);
+            return PageDataResult<OrgOutput>.PageResult(orgs);
+        }
+
         /// <summary>
         /// 根据用户Id获取所在片区的Id
         /// </summary>

Api/Ewide.Core/Service/Org/SysOrgService.cs

@@ -300,6 +300,7 @@ namespace Ewide.Core.Service
             }
             var orgs = await _sysOrgRep.DetachedEntities.Where(dataScopeList.Count > 0, u => dataScopeList.Contains(u.Id))
                                                         .Where(u => u.Status == (int)CommonStatus.ENABLE).OrderBy(u => u.Sort)
+                                                        .Where(input.Type != 0  , u=>u.Type < input.Type)
                                                         .Select(u => new OrgTreeNode
                                                         {
                                                             Id = u.Id,