diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs index b0cc7363..ccfa601f 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs @@ -60,7 +60,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpPost] public async Task Page(QueryPageCondition queryCondition) { - return Result.Success().SetData(await _repository.CommonPage(queryCondition)); + return Result.Success().SetData(await _repository.CommonPageAsync(queryCondition)); } /// @@ -84,7 +84,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpPut] public async Task Update(T entity) { - return Result.Success().SetStatus(await _repository.UpdateAsync(entity)); + return Result.Success().SetStatus(await _repository.UpdateIgnoreNullAsync(entity)); } /// @@ -96,7 +96,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpDelete] public async Task DeleteList(List ids) { - return Result.Success().SetStatus(await _repository.DeleteByLogic(ids)); + return Result.Success().SetStatus(await _repository.DeleteByLogicAsync(ids)); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index ba7873c4..8f490588 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs index 020d997b..a83d7b45 100644 --- a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs +++ b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs @@ -15,8 +15,9 @@ namespace Yi.Framework.Repository { public Task InsertReturnEntityAsync(T entity); public Task> StoreAsync(string storeName, object para); - public Task>> CommonPage(QueryPageCondition pars); + public Task>> CommonPageAsync(QueryPageCondition pars); public Task> GetListAsync(QueryCondition pars); - public Task DeleteByLogic(List ids); + public Task DeleteByLogicAsync(List ids); + public Task UpdateIgnoreNullAsync(T entity); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs index 4669e256..ce23c8b7 100644 --- a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs +++ b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs @@ -35,11 +35,22 @@ namespace Yi.Framework.Repository return await Db.Insertable(entity).ExecuteReturnEntityAsync(); } + /// + /// 更新忽略空值 + /// + /// + /// + public async Task UpdateIgnoreNullAsync(T entity) + { + return await Db.Updateable(entity).IgnoreColumns(true).ExecuteCommandAsync()>0; + } + + /// /// 逻辑多删除 /// /// - public async Task DeleteByLogic(List ids) + public async Task DeleteByLogicAsync(List ids) { var entitys = await Db.Queryable().Where(u => ids.Contains(u.Id)).ToListAsync(); entitys.ForEach(u=>u.IsDeleted=true); @@ -74,7 +85,7 @@ namespace Yi.Framework.Repository /// 仓储扩展方法:单表查询通用分页 /// /// - public async Task>> CommonPage(QueryPageCondition pars) + public async Task>> CommonPageAsync(QueryPageCondition pars) { RefAsync tolCount = 0; var result = await QueryConditionHandler(new QueryCondition() {OrderBys=pars.OrderBys,Parameters=pars.Parameters } ).ToPageListAsync(pars.Index, pars.Size, tolCount);