From 768528f59c476d016eb897fa3e761c26b801a931 Mon Sep 17 00:00:00 2001
From: FalconFly <12919280+falconfly@user.noreply.gitee.com>
Date: Tue, 16 Jul 2024 08:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CalendarNotepad/WorkMain.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/CalendarNotepad/WorkMain.cs b/CalendarNotepad/WorkMain.cs
index d793a15..52c4c89 100644
--- a/CalendarNotepad/WorkMain.cs
+++ b/CalendarNotepad/WorkMain.cs
@@ -1,5 +1,6 @@
 using CalendarNotepad.Extends;
 using CalendarNotepad.Models;
+using SqlSugar;
 
 namespace CalendarNotepad
 {
@@ -35,18 +36,15 @@ namespace CalendarNotepad
             var wd = this.mcWorkDay.SelectionStart.ToString("yyyyMMdd");
             var dr = "全天";
             var msg = this.rtbMsg.Text;
-            var qu = this.Db.Queryable<WorkUnit>().Where(a => a.DayRange == dr && a.WorkDay == wd).ToList();
+            var exp = Expressionable.Create<WorkUnit>().And(a => a.DayRange == dr && a.WorkDay == wd).ToExpression();
+
+            var qu = this.Db.Queryable<WorkUnit>().Where(exp).ToList();
             if(qu.Any() && msg.IsNullOrEmpty()) {
-                this.Db.Deleteable<WorkUnit>()
-                    .Where(a => a.DayRange == dr && a.WorkDay == wd)
-                    .ExecuteCommand();
+                this.Db.Deleteable<WorkUnit>().Where(exp).ExecuteCommand();
                 return;
             }
             if(qu.Any() && msg.IsNotNullOrEmpty()) {
-                this.Db.Updateable<WorkUnit>()
-                    .Where(a => a.DayRange == dr && a.WorkDay == wd)
-                    .SetColumns(a => a.WorkMessage == msg)
-                    .ExecuteCommand();
+                this.Db.Updateable<WorkUnit>().Where(exp).SetColumns(a => a.WorkMessage == msg).ExecuteCommand();
                 return;
             }
             if(!qu.Any() && msg.IsNotNullOrEmpty()) {