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

修改交接柜用户同时修改毒麻柜用户

This commit is contained in:
maqiao 2025-10-14 11:32:51 +08:00
parent 4d2dc1d024
commit 2bdc7e0db0
3 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MasaBlazorApp3/DataAccess/Impl/RoleDao.cs
View File

@ -23,7 +23,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
public int InsertRole(Role role)
{
role.MachineId = _setting.machineId;
role.MachineId = _setting.boxMachineId;
return _connection.InsertWithInt32Identity(role);
}
@ -50,7 +50,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
{
query = query.Where(r => r.RoleName.IndexOf(name) > -1);
}
query = query.Where(r => r.MachineId == _setting.machineId);
query = query.Where(r => r.MachineId == _setting.boxMachineId);
List<Role> list = await query
.OrderBy(r => r.Id)
@ -69,7 +69,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
public async Task<List<Role>> GetAllRoles()
{
return await _connection.Role.Where(r => r.MachineId == _setting.machineId).ToListAsync();
return await _connection.Role.Where(r => r.MachineId == _setting.boxMachineId).ToListAsync();
}
}
}

42
MasaBlazorApp3/DataAccess/Impl/UserDao.cs
View File

@ -38,7 +38,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
{
query = query.Where(r => r.NickName.IndexOf(nickname) > -1);
}
query = query.Where(u => u.MachineId == _setting.machineId);
query = query.Where(u => u.MachineId == _setting.boxMachineId);
List<User> list = await query
.LoadWith(u => u.role)
@ -57,24 +57,44 @@ namespace MasaBlazorApp3.DataAccess.Impl
public User GetById(int id)
{
return _connection.User.LoadWith(u => u.role).FirstOrDefault(u => u.Id == id);
return _connection.User.LoadWith(u => u.role).FirstOrDefault(u => u.Id == id && u.MachineId == _setting.boxMachineId);
}
public User GetByUsername(string username)
{
return _connection.User.LoadWith(u => (u.role)).FirstOrDefault(u => u.Username == username && u.MachineId == _setting.machineId);
return _connection.User.LoadWith(u => (u.role)).FirstOrDefault(u => u.Username == username && u.MachineId == _setting.boxMachineId);
}
public int InsertUser(User user)
{
user.MachineId = _setting.machineId;
user.MachineId = _setting.boxMachineId;
user.Password = MD5.GetMD5Hash("123456").ToLower();
#region 交接柜添加用户时毒麻柜同时也添加用户
User userDM = user;
userDM.MachineId = _setting.machineId;
_connection.InsertWithInt32Identity(userDM);
#endregion
return _connection.InsertWithInt32Identity(user);
}
public bool UpdateUser(User user)
{
#region 交接柜修改用户时毒麻柜同时也修改用户
User userOld = _connection.User
.Where(u => u.Id == user.Id).FirstOrDefault();
if(userOld != null)
{
User userDm=_connection.User.Where(u => u.Username == userOld.Username&&u.MachineId==_setting.machineId).FirstOrDefault();
if(userDm!=null)
{
userDm.NickName = user.NickName;
userDm.Username = user.Username;
userDm.RoleId = user.RoleId;
_connection.Update(userDm);
}
}
#endregion
var statement = _connection.User
.Where(u => u.Id == user.Id)
.Set(u => u.NickName, user.NickName)
@ -89,6 +109,18 @@ namespace MasaBlazorApp3.DataAccess.Impl
public bool DeleteeUser(int id)
{
#region 交接柜删除用户时毒麻柜同时也删除用户
User userOld = _connection.User
.Where(u => u.Id == id).FirstOrDefault();
if (userOld != null)
{
User userDm = _connection.User.Where(u => u.Username == userOld.Username && u.MachineId == _setting.machineId).FirstOrDefault();
if (userDm != null)
{
_connection.User.Where(u => u.Id == userDm.Id).Delete();
}
}
#endregion
return _connection.User.Where(u => u.Id == id).Delete() > 0;
}
//重置用户密码
@ -123,7 +155,7 @@ namespace MasaBlazorApp3.DataAccess.Impl
{
try
{
return _connection.HkcChangeShifts.Where(cs => cs.MachineId == _setting.machineId && cs.State == "0").FirstOrDefault();
return _connection.HkcChangeShifts.Where(cs => cs.MachineId == _setting.boxMachineId && cs.State == "0").FirstOrDefault();
}
catch (Exception ex)

2
MasaBlazorApp3/appsettings.json
View File

@ -13,7 +13,7 @@
"storage": "07010323",
"inPharmacyId": "062303",
"roomName": "麻醉科手术室",
"loginMode": 1,
"loginMode": 2,
"opFirst": true,
//自动退出登录时间,单位秒（0不自动退出）
"autoOutLog": 0,