From 8915f9ff0fa2def88b74dc8d846b868d55d6eb19 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 21 Mar 2024 20:42:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A4=E6=96=AD=E6=8F=90=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/DishesMenuService.cs  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
index d007c4d2..9c4dd628 100644
--- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
@@ -119,6 +119,18 @@ public class DishesMenuService : IDishesMenuService
 
         myBps.Contains(request.BusinessPlaceCode).ThrowIfFalse("非经营营业点,无法保存菜单");
 
+        if (request.Items.Any())
+        {
+            Expression<Func<DishesMenuEntity, bool>> whereCheck = LinqExpressionExtension.False<DishesMenuEntity>();
+            request.Items.ForEach(p =>
+            {
+                whereCheck = whereCheck.Or(x => !(x.EndDate < p.Period.Start || x.StartDate > p.Period.End));
+            });
+
+            var duplicate = await _dbContext.Queryable<DishesMenuEntity>().Where(whereCheck).AnyAsync();
+            duplicate.ThrowIfTrue("菜单时效冲突");
+        }
+
         var entities = request.Items.SelectMany(item =>
         {
             var customCode = item.CustomCode;
@@ -164,18 +176,6 @@ public class DishesMenuService : IDishesMenuService
 
         await _dbContext.Client.Deleteable<DishesMenuEntity>().Where(where).ExecuteCommandAsync();
         await _dbContext.InsertAsync(entities);
-
-        if (request.Items.Any())
-        {
-            Expression<Func<DishesMenuEntity, bool>> whereCheck = LinqExpressionExtension.False<DishesMenuEntity>();
-            request.Items.ForEach(p =>
-            {
-                whereCheck = where.Or(x => !(x.EndDate < p.Period.Start || x.StartDate > p.Period.End));
-            });
-
-            var duplicate = await _dbContext.Queryable<DishesMenuEntity>().Where(whereCheck).AnyAsync();
-            duplicate.ThrowIfTrue("菜单时效冲突");
-        }
     }
 
     public async Task<DishesMenuDetailDto> GetBookingDishesDetailAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCode)