From 8eb3154ddbd92bc792b24b217143d25476c90b8f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 31 十二月 2021 20:15:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/WebAPIController.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 6d0be5d..2fc61d1 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -181,9 +181,9 @@
ClsCNSRM oCnLoc = new ClsCNSRM();
DAL.ClsUser oUser = new DAL.ClsUser();
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- string sReturn = "娴嬭瘯";
- string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref sReturn);
- LogService.Write(sReturn);
+ //LogService.Write("娴嬭瘯1锛�"+ DBUtility.ClsPub.sExeReturnInfo);
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ //LogService.Write("娴嬭瘯2锛�" + DBUtility.ClsPub.sExeReturnInfo);
LogService.Write(FCusName);
if (FCusName == "澶忓疂鐢靛櫒")
ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
@@ -241,12 +241,13 @@
return objJsonResult; ;
}
//===========
- oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czymc='" + UserName + "'", "Gy_Czygl");
+ LogService.Write("select Czmm from Gy_Czygl where Czymc='" + UserName + "' and Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'");
+ oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czymc='" + UserName + "' and Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'", "Gy_Czygl");
if (oDs == null || oDs.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩欎釜鐢ㄦ埛锛屼笉鑳戒慨鏀瑰瘑鐮侊紒";
+ objJsonResult.Message = "鍘熷瘑鐮侀敊璇紒";
objJsonResult.data = null;
return objJsonResult; ;
}
--
Gitblit v1.9.1