From d05787f2c76307ae2bea1ee963262e59766f29bc Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 7 Aug 2024 10:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A4=E6=8E=A5=E6=9F=9CDM5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/EditUserDialogViewModel.cs     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/DM_Weight/ViewModels/EditUserDialogViewModel.cs b/DM_Weight/ViewModels/EditUserDialogViewModel.cs
index 17751bd..bde0aa1 100644
--- a/DM_Weight/ViewModels/EditUserDialogViewModel.cs
+++ b/DM_Weight/ViewModels/EditUserDialogViewModel.cs
@@ -14,6 +14,7 @@ using DM_Weight.Finger;
 using DM_Weight.Models;
 using DM_Weight.msg;
 using DM_Weight.util;
+using SqlSugar;
 
 namespace DM_Weight.ViewModels
 {
@@ -37,6 +38,9 @@ namespace DM_Weight.ViewModels
         }
 
         public List<RoleDm> Roles { get; set; }
+        //交接柜用户
+        private UserList JiaojieUser;
+        //private RoleDm JiaojieRole;
 
         private string _oldPass;
         public string OldPass
@@ -98,11 +102,15 @@ namespace DM_Weight.ViewModels
                     // 修改密码
                     if (OnlyPassword)
                     {
+                        JiaojieUser= SqlSugarHelper.Db.Queryable<UserList>().Where(r => r.MachineId == "DM5"&&r.UserName==UserList.UserName).OrderBy(r => r.Id).First();
                         if (MD5.GetMD5Hash(OldPass).ToLower().Equals(UserList.PassWord.ToLower()))
                         {
                             // 旧密码输入正确
                             UserList.PassWord = MD5.GetMD5Hash(NewPass);
                             SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.PassWord }).ExecuteCommand();
+                            //修改交接柜用户密码
+                            JiaojieUser.PassWord = UserList.PassWord;
+                            SqlSugarHelper.Db.Updateable<UserList>(JiaojieUser).UpdateColumns(u => new { u.PassWord }).ExecuteCommand();
                             // 关闭当前窗口
                             RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
                         }
@@ -116,17 +124,29 @@ namespace DM_Weight.ViewModels
                     {
                         if (UserList.Id > 0)
                         {
+                            JiaojieUser = SqlSugarHelper.Db.Queryable<UserList>().Where(r => r.MachineId == "DM5" && r.UserName == UserList.UserName).OrderBy(r => r.Id).First();
                             // 更新
                             // 没有写密码
                             if (string.IsNullOrEmpty(NewPass))
                             {
                                 SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.UserBarcode, u.RoleId }).ExecuteCommand();
+
+                                //更新交接柜用户
+                                JiaojieUser.Nickname = UserList.Nickname;
+                                JiaojieUser.UserName= UserList.UserName;
+                                JiaojieUser.UserBarcode= UserList.UserBarcode;
+                                SqlSugarHelper.Db.Updateable<UserList>(JiaojieUser).UpdateColumns(u => new { u.Nickname, u.UserName, u.UserBarcode, u.RoleId }).ExecuteCommand();
+
                             }
                             // 更改了密码
                             else
                             {
                                 UserList.PassWord = MD5.GetMD5Hash(NewPass);
                                 SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
+
+                                JiaojieUser.PassWord= UserList.PassWord;
+                                SqlSugarHelper.Db.Updateable<UserList>(JiaojieUser).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
+
                             }
                         }
                         else
@@ -135,6 +155,12 @@ namespace DM_Weight.ViewModels
                             UserList.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM3";
                             // 插入
                             SqlSugarHelper.Db.Insertable<UserList>(UserList).InsertColumns(u => new { u.Id, u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId, u.MachineId }).ExecuteCommand();
+                            // 插入交接柜用户
+                            int? roleId = SqlSugarHelper.Db.Queryable<RoleDm>().Where(r => r.MachineId == "DM5").OrderBy(r => r.Id).Select(r=>r.Id).First(); 
+                            JiaojieUser = UserList;
+                            JiaojieUser.MachineId = "DM5";
+                            JiaojieUser.RoleId= roleId;
+                            SqlSugarHelper.Db.Insertable<UserList>(JiaojieUser).InsertColumns(u => new { u.Id, u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId, u.MachineId }).ExecuteCommand();
                         }
                         RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
                     }