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

src/Hotline.Api/Controllers/SysController.cs

@@ -376,8 +376,8 @@ namespace Hotline.Api.Controllers
             model = _mapper.Map<SystemArea>(dto);
 
             //验证重复
-            var area = await _systemAreaRepository.GetAsync(x => x.ParentId == dto.ParentId && x.AreaName == dto.AreaName);
-            if (area != null)
+            var area = await _systemAreaRepository.Queryable(includeDeleted: true).Where(x => x.ParentId == dto.ParentId && x.AreaName == dto.AreaName).ToListAsync();
+            if (area.Count > 1)
             {
                throw UserFriendlyException.SameMessage("同目录下已存在相同数据，不能修改");
             }