maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加修改用户时同步用户到交接柜数据

This commit is contained in:
maqiao 2024-08-07 13:10:32 +08:00
parent d05787f2c7
commit ac3a1f53c4
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -13,6 +13,8 @@
<!-- 设备id -->
<add key="machineId" value="DM3" />
<!--交接柜设备id-->
<add key="jj_machineId" value="DM5" />
<!--请领药库-->
<add key="colloctedId" value="住院,DM2,门诊,DM22" />
<!-- 供应单位 -->

16
DM_Weight/ViewModels/EditUserDialogViewModel.cs
View File

@ -40,6 +40,7 @@ namespace DM_Weight.ViewModels
public List<RoleDm> Roles { get; set; }
//交接柜用户
private UserList JiaojieUser;
private string UserName;
//private RoleDm JiaojieRole;
private string _oldPass;
@ -102,7 +103,7 @@ 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();
JiaojieUser= SqlSugarHelper.Db.Queryable<UserList>().Where(r => r.MachineId == (ConfigurationManager.AppSettings["jj_machineId"]??"DM5")&&r.UserName== UserName).OrderBy(r => r.Id).First();
if (MD5.GetMD5Hash(OldPass).ToLower().Equals(UserList.PassWord.ToLower()))
{
// 旧密码输入正确
@ -124,7 +125,7 @@ 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();
JiaojieUser = SqlSugarHelper.Db.Queryable<UserList>().Where(r => r.MachineId == (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5") && r.UserName == UserName).OrderBy(r => r.Id).First();
// 更新
// 没有写密码
if (string.IsNullOrEmpty(NewPass))
@ -145,6 +146,10 @@ namespace DM_Weight.ViewModels
SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
JiaojieUser.PassWord= UserList.PassWord;
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.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
}
@ -156,9 +161,9 @@ namespace DM_Weight.ViewModels
// 插入
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();
int? roleId = SqlSugarHelper.Db.Queryable<RoleDm>().Where(r => r.MachineId == (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5")).OrderBy(r => r.Id).Select(r=>r.Id).First();
JiaojieUser = UserList;
JiaojieUser.MachineId = "DM5";
JiaojieUser.MachineId = ConfigurationManager.AppSettings["jj_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();
}
@ -215,12 +220,15 @@ namespace DM_Weight.ViewModels
OnlyPassword = parameters.GetValue<bool>("EditPass");
EditUser = false;
Title = "修改密码";
UserName=UserList.UserName;
}
else
{
if (parameters.ContainsKey("User"))
{
UserList = parameters.GetValue<UserList>("User");
UserName = UserList.UserName;
}
if (UserList.Id == null)
{