Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

ViewModel/MainWindowViewModel.cs

@@ -63,10 +63,6 @@ namespace SunlightAggregationManager.ViewModel
                 ActionLog = (SQLiteHelpers.ExecuteDataSet("select * from ActionLog", null)?.Tables[0] ?? new DataTable()).Clone();
                // SQLiteHelpers.Close();
 
-                if (UserData.Columns.Contains("UserID"))
-                {
-                    UserData.Columns.Remove("UserID");
-                }
                 DataRow[] dataRows = UserData.Select("State<90");
                 foreach (DataRow row in dataRows)
                 {
@@ -160,20 +156,36 @@ namespace SunlightAggregationManager.ViewModel
             }
         }
 
+        public static DataRow? Selet_Row(DataTable DB, string? key)//查询
+        {
+            try
+            {
+                lock (DB)
+                {
+                    DataRow drEmployee = DB.Select(key).First();
+                    return drEmployee;
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Selet_Row:" + ex.ToString());
+                return null;
+            }
+        }
         public static object? Selet_Memory(DataTable DB, string name, string? key)//查询
         {
             try
             {
                 lock (DB)
                 {
-                    var drEmployee = DB.Select(key).First();
+                    DataRow drEmployee = DB.Select(key).First();
                     object? index = drEmployee.Field<object>(name);
                     return index;
                 }
             }
             catch (Exception ex)
             {
-                Console.WriteLine("SDTD:" + ex.ToString());
+                Console.WriteLine("Selet_Memory:" + ex.ToString());
                 return null;
             }
         }