diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
index 376c3be0..abd465df 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
@@ -75,14 +75,19 @@ namespace Yi.Framework.ApiMicroservice.Controllers
///
[HttpGet]
[AllowAnonymous]
- public async Task Import()
+ public async Task Import([FromForm(Name = "file")] IFormFile formFile)
{
- throw null;
- //var users = await _iUserService._repository.GetListAsync();
- //var fileName = DateTime.Now.ToString("yyyyMMddHHmmssffff") + nameof(UserEntity) + PathConst.DataExport;
- //var path = ExcelHelper.ExportExcel(users, fileName, Path.Combine(PathConst.wwwroot, PathEnum.Temp.ToString()));
- //var file = System.IO.File.OpenRead(path);
- //return File(file, "text/plain", $"{ fileName }.xlsx");
+ List users = ExcelHelper.ImportData(formFile.OpenReadStream());
+
+ var _repository = _iUserService._repository;
+
+ //全量删除在重新插入
+ var res = await _repository.UseTranAsync(async () =>
+ {
+ await _repository.DeleteAsync(u => true);
+ await _repository.InsertRangeAsync(users);
+ });
+ return Result.Success().SetStatus(res);
}
///