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().Where(a => a.DayRange == dr && a.WorkDay == wd).ToList(); + var exp = Expressionable.Create().And(a => a.DayRange == dr && a.WorkDay == wd).ToExpression(); + + var qu = this.Db.Queryable().Where(exp).ToList(); if(qu.Any() && msg.IsNullOrEmpty()) { - this.Db.Deleteable() - .Where(a => a.DayRange == dr && a.WorkDay == wd) - .ExecuteCommand(); + this.Db.Deleteable().Where(exp).ExecuteCommand(); return; } if(qu.Any() && msg.IsNotNullOrEmpty()) { - this.Db.Updateable() - .Where(a => a.DayRange == dr && a.WorkDay == wd) - .SetColumns(a => a.WorkMessage == msg) - .ExecuteCommand(); + this.Db.Updateable().Where(exp).SetColumns(a => a.WorkMessage == msg).ExecuteCommand(); return; } if(!qu.Any() && msg.IsNotNullOrEmpty()) {