From e7a27cc4744e05fc4c7fefaa7f551eed18584f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 10 Apr 2022 22:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseController/BaseCrudController.cs      |   6 +++---
 .../yi-sqlsugar-dev.db                        | Bin 12288 -> 12288 bytes
 .../Yi.Framework.Repository/IRepository.cs    |   5 +++--
 .../Yi.Framework.Repository/Repository.cs     |  15 +++++++++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

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<Result> Page(QueryPageCondition queryCondition)
         {
-            return Result.Success().SetData(await _repository.CommonPage(queryCondition));
+            return Result.Success().SetData(await _repository.CommonPageAsync(queryCondition));
         }
 
         /// <summary>
@@ -84,7 +84,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPut]
         public async Task<Result> Update(T entity)
         {
-            return Result.Success().SetStatus(await _repository.UpdateAsync(entity));
+            return Result.Success().SetStatus(await _repository.UpdateIgnoreNullAsync(entity));
         }
 
         /// <summary>
@@ -96,7 +96,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpDelete]
         public async Task<Result> DeleteList(List<long> 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 ba7873c48127d72436c06b4c70510f06da8384c6..8f490588091104e1d5046fafb117c8d5b69a3089 100644
GIT binary patch
delta 112
zcmZojXh@hK&B#7c#+i|QW5P0i7Dont$IXHQ=KTJRHjI313=9m;49*-3f{m88BL7Se
umo^D77#SED=^B{m8X71V8CjW{Ss7aB8JPhEO-yk}Sy-4EZk`}tAOHZTXBiy;

delta 85
zcmZojXh@hK&B!!S#+i|6W5P0imKX;9n9YI;LHs6-ii~`03=9m;3=A9$f{m88BL7Se
pmo^D77#SED=^B{m8dxeAnpqi|S{WGYnVK0JnHpMdo*-W!003P~6Sn{W

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<T> InsertReturnEntityAsync(T entity);
         public Task<List<S>> StoreAsync<S>(string storeName, object para);
-        public Task<PageModel<List<T>>> CommonPage(QueryPageCondition pars);
+        public Task<PageModel<List<T>>> CommonPageAsync(QueryPageCondition pars);
         public  Task<List<T>> GetListAsync(QueryCondition pars);
-        public Task<bool> DeleteByLogic(List<long> ids);
+        public Task<bool> DeleteByLogicAsync(List<long> ids);
+        public  Task<bool> 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();
         }
 
+        /// <summary>
+        /// 更新忽略空值
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<bool> UpdateIgnoreNullAsync(T entity)
+        {
+            return await Db.Updateable(entity).IgnoreColumns(true).ExecuteCommandAsync()>0;
+        }
+
+
         /// <summary>
         /// 逻辑多删除
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> DeleteByLogic(List<long> ids)
+        public async Task<bool> DeleteByLogicAsync(List<long> ids)
         {
             var entitys = await Db.Queryable<T>().Where(u => ids.Contains(u.Id)).ToListAsync();
             entitys.ForEach(u=>u.IsDeleted=true);
@@ -74,7 +85,7 @@ namespace Yi.Framework.Repository
         /// 仓储扩展方法:单表查询通用分页 
         /// </summary>
         /// <returns></returns>
-        public  async Task<PageModel<List<T>>> CommonPage(QueryPageCondition pars)
+        public  async Task<PageModel<List<T>>> CommonPageAsync(QueryPageCondition pars)
         {
             RefAsync<int> tolCount = 0;
             var result = await  QueryConditionHandler(new QueryCondition() {OrderBys=pars.OrderBys,Parameters=pars.Parameters } ).ToPageListAsync(pars.Index, pars.Size, tolCount);