From 8c6e292c508312eca0aef4c203e5857c4fc3094c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 07 九月 2024 09:18:39 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Controllers/BasisController.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 0a43b54..87c97b8 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -201,7 +201,7 @@
{
pwdOld = Md5Tools.CalcMd5(pwdOld);
pwdNew = Md5Tools.CalcMd5(pwdNew);
- pwdNewTwo = Md5Tools.CalcMd5(pwdNewTwo);
+ //pwdNewTwo = Md5Tools.CalcMd5(pwdNewTwo);
//鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
SysUserInfor user = await _userInforServer.GetUserInfoById(_userManager.UserId);
if (user == null)
@@ -209,7 +209,7 @@
if (user.PassWord != pwdOld)
throw Oops.Bah("鍘熷瘑鐮佷笉姝ｇ‘");
//淇敼瀵嗙爜
- int i = await _userInforServer.UptUserPassWord(pwdNew, _userManager.UserId);
+ int i = await _userInforServer.UptUserPassWord(pwdNew, pwdNewTwo, _userManager.UserId);
if (i <= 0)
throw Oops.Bah("淇敼瀵嗙爜澶辫触");
}
@@ -1043,7 +1043,7 @@
public async Task DelLogisticsInfo(IdVm model)
{
await _logisticsSvc.DelLogisticsInfo(model.Id, _userManager.UserId);
- SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
+ SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsDelInfo(model.Id);
await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", logisit.CarrierName, "鍒犻櫎", "鍒犻櫎鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + logisit.CarrierName, _userManager.UserId);
}
/// <summary>
--
Gitblit v1.8.0