From c8003347246a0dce47bdcc87fed2c65897bf34a8 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Sat, 2 Nov 2024 16:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E7=AE=B1=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=A6=82=E8=8D=AF=E7=AE=B1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=98=AF=E5=BD=92=E5=B1=9E=E8=8D=AF=E5=B8=88=E5=A6=82?=
 =?UTF-8?q?=E6=97=A0=E8=8D=AF=E5=B8=88=E5=88=99=E6=B7=BB=E5=8A=A0=E8=AF=B7?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/SettingBoxWindowViewModel.cs      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
index e54f071..10adb8c 100644
--- a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
+++ b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
@@ -159,9 +159,21 @@ namespace DM_Weight.ViewModels
                             //药箱归属药师，把药师信息显示出来
                             UserStatus = Visibility.Visible;
                             UserListSelectedItem = _userLists.Where(sul => sul.UserId.ToString() == cnl.BelongUser).FirstOrDefault();
-                            if (UserListSelectedItem == null && _userLists != null)
+                            if (UserListSelectedItem == null)
                             {
-                                UserListSelectedItem = _userLists[0];
+                                if (UserLists.Where(us => us.UserName == "请选择药师").Count() <= 0)
+                                {
+                                    BindUserList nullBind = new BindUserList();
+                                    nullBind.UserId = 0;
+                                    nullBind.UserName = "请选择药师";
+                                    _userLists.Add(nullBind);
+
+                                }
+                                UserListSelectedItem = UserLists.Where(us => us.UserName == "请选择药师").FirstOrDefault();
+                            }
+                            else
+                            {
+                                UserListSelectedItem = UserLists[0];
                             }
                         }
                         else