Merge branch 'master' of http://git.fway.com.cn/Fengwo/hotline

src/Hotline.Api/Controllers/SysController.cs

@@ -338,7 +338,7 @@ namespace Hotline.Api.Controllers
                 throw UserFriendlyException.SameMessage("只允许添加乡镇、街道数据，请选择区县");
             }
             //验证重复
-            var area = await _systemAreaRepository.GetAsync(x => x.ParentId == dto.ParentId && x.AreaName == dto.AreaName);
+            var area = await _systemAreaRepository.Queryable(includeDeleted:true).FirstAsync(x => x.ParentId == dto.ParentId && x.AreaName == dto.AreaName);
             if (area!=null)
             {
                 if (area.IsDeleted)