Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Api/Ewide.Application/Ewide.Application.xml

@@ -1456,5 +1456,20 @@
             上报备注
             </summary>
         </member>
+        <member name="P:Ewide.Application.AddHouseZoneInput.Pid">
+            <summary>
+            所属街道
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.AddHouseZoneInput.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.UpdateHouseZoneInput.Id">
+            <summary>
+            机构Id
+            </summary>
+        </member>
     </members>
 </doc>

Api/Ewide.Application/Service/HouseSafety/HouseZone/Dto/HouseZoneInput.cs

@@ -1,4 +1,5 @@
-using System;
+using Ewide.Core.Service;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -13,4 +14,28 @@ namespace Ewide.Application
         [MinLength(9, ErrorMessage = "区域编码长度必须为9位及以上")]
         public string AreaCode { get; set; }
     }
+
+    public class AddHouseZoneInput : OrgInput
+    {
+        /// <summary>
+        /// 所属街道
+        /// </summary>
+        [Required(ErrorMessage = "所属街道不能为空")]
+        public override string Pid { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [Required(ErrorMessage = "片区名称不能为空")]
+        public override string Name { get; set; }
+
+    }
+
+    public class UpdateHouseZoneInput : AddHouseZoneInput
+    {
+        /// <summary>
+        /// 机构Id
+        /// </summary>
+        [Required(ErrorMessage = "片区Id不能为空")]
+        public string Id { get; set; }
+    }
 }

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

@@ -2,9 +2,11 @@
 using Ewide.Core.Extension;
 using Ewide.Core.Service;
 using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
 using Furion.DependencyInjection;
 using Furion.DynamicApiController;
 using Furion.FriendlyException;
+using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -104,9 +106,9 @@ namespace Ewide.Application.Service
         }
 
         [HttpGet("/houseZone/autoIncrement")]
-        public async Task<dynamic> AutoIncrement([FromQuery] string code)
+        public async Task<dynamic> AutoIncrement([FromQuery] string roadId)
         {
-            var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.AreaCode == code);
+            var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == roadId && p.Type == 3);
             if (road == null) throw Oops.Oh("组织机构错误");
             return await AutoIncrement(road);
         }
@@ -119,7 +121,7 @@ namespace Ewide.Application.Service
         }
 
         [HttpPost("/houseZone/add")]
-        public async Task AddZone(AddOrgInput input)
+        public async Task AddZone(AddHouseZoneInput input)
         {
             /*
              * 区县市限定所属区域/上级机构是否为当前区
@@ -136,15 +138,14 @@ namespace Ewide.Application.Service
             var roles = await _userManager.GetUserRoleList();
             if (roles.Any(p => p.Code == areaManager))
             {
-                var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.AreaCode == input.AreaCode);
-                if (!road.Pids.Contains(org.Id)) throw Oops.Oh("组织机构错误");
+                var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Pid);
+                if (!road.Pids.Contains(org.Id)) throw Oops.Oh("当前用户组织机构错误");
 
-                input.Pid = road.Id;
+                input.AreaCode = road.AreaCode;
                 input.Code = road.Code + (await AutoIncrement(road)).ToString().PadLeft(3, '0');
             }
             else if (roles.Any(p => p.Code == roadManager))
             {
-                input.Pid = org.Id;
                 input.AreaCode = org.AreaCode;
 
                 input.Code = org.Code + (await AutoIncrement(org)).ToString().PadLeft(3, '0');
@@ -152,7 +153,17 @@ namespace Ewide.Application.Service
 
             input.Type = (int)OrgType.片区;
 
-            await _sysOrgService.AddOrg(input);
+            AddOrgInput addOrgInput = input.Adapt<AddOrgInput>();
+            await _sysOrgService.AddOrg(addOrgInput);
+        }
+
+        [HttpPost("/houseZone/edit")]
+        public async Task EditZone(UpdateHouseZoneInput input)
+        {
+            var zone = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(z => z.Id == input.Id);
+            if(zone == null) throw Oops.Oh("修改失败：数据有误，刷新列表后再尝试修改");
+            zone.Remark = input.Remark;
+            await zone.UpdateIncludeAsync(new[] { nameof(SysOrg.Remark) }, true);
         }
     }
 }

Api/Ewide.Core/Service/Org/Dto/OrgInput.cs

@@ -10,7 +10,7 @@ namespace Ewide.Core.Service
         /// <summary>
         /// 父Id
         /// </summary>
-        public string Pid { get; set; }
+        public virtual string Pid { get; set; }
 
         /// <summary>
         /// 父Ids