From 156e0d593769d1c4438eb1c6d4547063f76331b3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 19 十一月 2025 15:52:31 +0800
Subject: [PATCH] 修改拣货拼托bug
---
Wms/WMS.BLL/SysServer/UserInforServer.cs | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/UserInforServer.cs b/Wms/WMS.BLL/SysServer/UserInforServer.cs
index 29fbd2d..417dc61 100644
--- a/Wms/WMS.BLL/SysServer/UserInforServer.cs
+++ b/Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -35,25 +35,49 @@
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 &&m.IsDel=="0");
- if (modUser != null) //璐﹀彿瀵嗙爜鏄惁姝ｇ‘
+ //鏌ヨ瀵嗙爜宸查敊璇鏁�
+ string pwdErrNumSql = $@"select PwdErrNum from SysUserInfor where UserName='{loginName}'";
+ int pwdErrNum = Db.Ado.GetInt(pwdErrNumSql);
+ //璁惧畾瀵嗙爜閿欒鐨勬鏁�
+ string funNumSql = $@"select SetValue from SysFunSetting where IsDel='0' and IsEnable='NO' and FunSetNo='pwdErrNum' and GroupNo='pwdErrNum'";
+ int funNum = Db.Ado.GetInt(funNumSql);
+
+ //姣旇緝璁惧畾娆℃暟鍜屽凡閿欒娆℃暟
+ if (pwdErrNum < funNum)
{
- if (modUser.Status == "0") //褰撳墠璐﹀彿鏄惁姝ｅ父鍚敤
+ //loginPwd = Md5Tools.CalcMd5(loginPwd);
+ var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.UserName == loginName && m.PassWord == loginPwd && m.IsDel == "0");
+ if (modUser != null) //璐﹀彿瀵嗙爜鏄惁姝ｇ‘
{
- //鏈�鍚庣櫥闄嗘椂闂�
- await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync();
- return modUser.Id;
+ if (modUser.Status == "0") //褰撳墠璐﹀彿鏄惁姝ｅ父鍚敤
+ {
+ //瀵嗙爜閿欒娆℃暟+1
+ string uptErrNumSql = $@"update SysUserInfor set PwdErrNum=0 where UserName='{loginName}'";
+ int uptErrNum = Db.Ado.ExecuteCommand(uptErrNumSql);
+
+ //鏈�鍚庣櫥闄嗘椂闂�
+ await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync();
+ return modUser.Id;
+ }
+ else //褰撳墠璐﹀彿琚鐢�
+ {
+ return 0;
+ }
}
- else //褰撳墠璐﹀彿琚鐢�
+ else //璐﹀彿瀵嗙爜涓嶆纭垨娌℃湁姝よ处鍙�
{
- return 0;
+ //瀵嗙爜閿欒娆℃暟+1
+ string addErrNumSql = $@"update SysUserInfor set PwdErrNum+=1 where UserName='{loginName}'";
+ int addErrNum = Db.Ado.ExecuteCommand(addErrNumSql);
+
+ return -1;
}
}
- else //璐﹀彿瀵嗙爜涓嶆纭垨娌℃湁姝よ处鍙�
+ else//閿佸畾璐﹀彿
{
- return -1;
+ return -2;
}
+
}
/// <summary>
@@ -67,12 +91,12 @@
.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")
+ .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)
- .WhereIF(modUser.UserName.ToUpper() != "ADMIN", a => a.CreateUser == _userManager.UserId)
+ //.WhereIF(modUser.UserName.ToUpper() != "ADMIN", a => a.CreateUser == _userManager.UserId)
.Where(a => a.IsDel == "0")
.Select<UserInfoDto>((a, b, c, d) => new UserInfoDto()
{
@@ -195,7 +219,7 @@
/// <param name="userId">鐢ㄦ埛id</param>
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
- public async Task<int> UptUserPassWord(string pwdNew,string pwdNewTwo, int userId)
+ public async Task<int> UptUserPassWord(string pwdNew, string pwdNewTwo, int userId)
{
var funSet = Db.Queryable<SysFunSetting>().Where(m => m.IsDel == "0" && m.FunSetName == "瀵嗙爜瑙勫垯" && m.IsEnable == "NO").ToList().FirstOrDefault();
if (funSet != null)
--
Gitblit v1.8.0