diff --git a/EX/SunlightAggregationManager.db b/EX/SunlightAggregationManager.db index 8343562..436f95c 100644 Binary files a/EX/SunlightAggregationManager.db and b/EX/SunlightAggregationManager.db differ diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 2262162..251b74d 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -263,10 +263,13 @@ namespace SunlightAggregationManager.UserClass var groups = MainWindowViewModel.Selet_Memory(MainWindowViewModel._userData, "Groups", "User='" + person?.User + "'"); + var department = MainWindowViewModel.Selet_Memory(MainWindowViewModel._userData, + "Department", "User='" + person?.User + "'"); - DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("" + - "select * from Notification WHERE Groups='" + groups + "' and Id>'" + - s_ + "'", null)?.Tables[0] ?? new DataTable(); + + DataTable resultTable = MainWindowViewModel.SQLiteHelpers.ExecuteDataSet("" + + "select * from Notification WHERE Groups='" + groups + "'and Department='" + + "' and Id>'" + s_ + "'", null)?.Tables[0] ?? new DataTable(); if(resultTable.Rows.Count==0) resultTable.Rows.Add(); //格式化返回信息