From 1ac2c31898b2a10906c0058b1b62f73f5ea6daf9 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 29 八月 2024 09:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS
---
Wms/WMS.BLL/SysServer/UserInforServer.cs | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/UserInforServer.cs b/Wms/WMS.BLL/SysServer/UserInforServer.cs
index 6d6ecac..30997b1 100644
--- a/Wms/WMS.BLL/SysServer/UserInforServer.cs
+++ b/Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -21,14 +21,12 @@
{
public class UserInforServer : IUserInforServer
{
- public IUserInforRepository UserSvc { get; set; }
readonly IMapper _mapper;
private readonly IFunSettingServer _setting;
private static readonly SqlSugarScope Db = DataContext.Db;
private readonly UserManager _userManager;
- public UserInforServer(IUserInforRepository userSvc, IMapper mapper, IFunSettingServer setting, UserManager userManager)
+ public UserInforServer(IMapper mapper, IFunSettingServer setting, UserManager userManager)
{
- UserSvc = userSvc;
_mapper = mapper;
_setting = setting;
_userManager = userManager;
@@ -37,7 +35,7 @@
public async Task<int> LoginAdmin(string loginName, string loginPwd)
{
//loginPwd = Md5Tools.CalcMd5(loginPwd);
- var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.UserName == loginName && m.PassWord == loginPwd);
+ var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.UserName == loginName && m.PassWord == loginPwd &&m.IsDel=="0");
if (modUser != null) //璐﹀彿瀵嗙爜鏄惁姝ｇ‘
{
if (modUser.Status == "0") //褰撳墠璐﹀彿鏄惁姝ｅ父鍚敤
@@ -56,13 +54,6 @@
return -1;
}
}
- public SysUserInfor CeShi()
- {
- var date = UserSvc.ceshi();
-
- return date;
-
- }
/// <summary>
/// 鑾峰彇鐢ㄦ埛瑙掕壊淇℃伅
@@ -74,12 +65,19 @@
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysDepartment>((a, b, c) => a.DepartmentNo == c.DepartmentNo)
.LeftJoin<SysRoles>((a, b, c, d) => a.RoleNo == d.RoleNo)
+ .Where((a,b,c,d)=>d.IsDel == "0")
.WhereIF(!string.IsNullOrEmpty(UserName), a => a.UserName.Contains(UserName))
.WhereIF(!string.IsNullOrEmpty(DepartmentNo), a => a.DepartmentNo == DepartmentNo)
.WhereIF(!string.IsNullOrEmpty(RoleNo), a => a.RoleNo == RoleNo)
.WhereIF(!string.IsNullOrEmpty(Status), a => a.Status == Status)
.Where(a => a.IsDel == "0")
- .Select<UserInfoDto>()
+ .Select<UserInfoDto>((a, b, c, d) => new UserInfoDto()
+ {
+ RealName = a.RealName,
+ CreateUserName = b.RealName,
+ DepartmentName = c.DepartmentName,
+ RoleName = d.RoleName,
+ }, true)
.ToListAsync();
}
@@ -118,11 +116,10 @@
}
else if (count == 0)
{
- //鏂板鐢ㄦ埛
- //i = await UserSvc.InsertUserInfo(userinfo);
userinfo.PassWord = Md5Tools.CalcMd5("boxline");
userinfo.SetPasswordTime = DateTime.Now;
userinfo.CreateTime = DateTime.Now;
+ userinfo.CreateUser = _userManager.UserId;
i = await Db.Insertable(userinfo).ExecuteCommandAsync();
if (i <= 0)
throw Oops.Bah("鏂板鐢ㄦ埛淇℃伅澶辫触");
@@ -167,9 +164,10 @@
}
else if (count == 0)
{
+ userdto.UpdateUser = _userManager.UserId;
userdto.UpdateTime = DateTime.Now;
i = await Db.Updateable(userlist)
- .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres })
+ .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.UpdateUser, s.UpdateTime })
.ExecuteCommandAsync();
if (i <= 0)
throw Oops.Bah("缂栬緫鐢ㄦ埛淇℃伅澶辫触");
@@ -182,17 +180,15 @@
/// </summary>
/// <param name="userids">鐢ㄦ埛id</param>
/// <returns></returns>
- public async Task<SysUserInfor> GetUserInfoById(int userids)
+ public async Task<SysUserInfor> GetUserInfoById(int userid)
{
- return await Db.Queryable<SysUserInfor>().FirstAsync(s => s.Id == userids && s.IsDel == "0");
+ return await Db.Queryable<SysUserInfor>().FirstAsync(s => s.Id == userid && s.IsDel == "0");
}
/// <summary>
/// 淇敼鐢ㄦ埛瀵嗙爜
/// </summary>
- /// <param name="pwdOld">鍘熷瘑鐮�</param>
/// <param name="pwdNew">鏂板瘑鐮�</param>
- /// <param name="pwdNewTwo">纭瀵嗙爜</param>
/// <param name="userId">鐢ㄦ埛id</param>
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
@@ -202,6 +198,7 @@
.Where(s => s.Id == userId)
.SetColumns(s => s.UpdateTime == DateTime.Now)
.SetColumns(s => s.UpdateUser == _userManager.UserId)
+ .SetColumns(s=>s.PassWord == pwdNew)
.SetColumns(s => s.SetPasswordTime == DateTime.Now)
.ExecuteCommandAsync();
}
--
Gitblit v1.8.0