添加用户时添加交接柜DM5用户
This commit is contained in:
		
							parent
							
								
									469b8aebe1
								
							
						
					
					
						commit
						d05787f2c7
					
				| 
						 | 
					@ -14,6 +14,7 @@ using DM_Weight.Finger;
 | 
				
			||||||
using DM_Weight.Models;
 | 
					using DM_Weight.Models;
 | 
				
			||||||
using DM_Weight.msg;
 | 
					using DM_Weight.msg;
 | 
				
			||||||
using DM_Weight.util;
 | 
					using DM_Weight.util;
 | 
				
			||||||
 | 
					using SqlSugar;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace DM_Weight.ViewModels
 | 
					namespace DM_Weight.ViewModels
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					@ -37,6 +38,9 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public List<RoleDm> Roles { get; set; }
 | 
					        public List<RoleDm> Roles { get; set; }
 | 
				
			||||||
 | 
					        //交接柜用户
 | 
				
			||||||
 | 
					        private UserList JiaojieUser;
 | 
				
			||||||
 | 
					        //private RoleDm JiaojieRole;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private string _oldPass;
 | 
					        private string _oldPass;
 | 
				
			||||||
        public string OldPass
 | 
					        public string OldPass
 | 
				
			||||||
| 
						 | 
					@ -98,11 +102,15 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                    // 修改密码
 | 
					                    // 修改密码
 | 
				
			||||||
                    if (OnlyPassword)
 | 
					                    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()))
 | 
					                        if (MD5.GetMD5Hash(OldPass).ToLower().Equals(UserList.PassWord.ToLower()))
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            // 旧密码输入正确
 | 
					                            // 旧密码输入正确
 | 
				
			||||||
                            UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
					                            UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
				
			||||||
                            SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.PassWord }).ExecuteCommand();
 | 
					                            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));
 | 
					                            RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
| 
						 | 
					@ -116,17 +124,29 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        if (UserList.Id > 0)
 | 
					                        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))
 | 
					                            if (string.IsNullOrEmpty(NewPass))
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.UserBarcode, u.RoleId }).ExecuteCommand();
 | 
					                                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
 | 
					                            else
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
					                                UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
				
			||||||
                                SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
 | 
					                                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
 | 
					                        else
 | 
				
			||||||
| 
						 | 
					@ -135,6 +155,12 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                            UserList.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM3";
 | 
					                            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();
 | 
					                            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));
 | 
					                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue