From 8012d4bb58c440b8b8109744d89b15161460fa45 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 13 一月 2022 11:35:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 9cff91f..617716e 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -130,7 +130,7 @@
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_IF_UserList_Edit where 鐢ㄦ埛缂栫爜= " + HID + " ", "h_v_IF_UserList_Edit");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_IF_UserList_Edit where 鐢ㄦ埛缂栫爜='" + HID + "' ", "h_v_IF_UserList_Edit");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ鐢ㄦ埛" };
@@ -162,24 +162,22 @@
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_Gy_User(msg2);
- oCN.BeginTran();
//淇濆瓨
if (msg3=="Add") //鏂板
{
- oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain) values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString()+"')");
+ oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain,HEmpID) values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "')");
}
else //淇敼
{
if (lsmain[0].Czyyz != "" && lsmain[0].Czmm == lsmain[0].Czyyz) //淇敼瀵嗙爜
{
- oCN.RunProc("update Gy_Czygl set Czymc='"+lsmain[0].Czymc.ToString()+ "',Czmm='"+ ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "',Explain='"+lsmain[0].Explain.ToString()+ "' where Czybm='"+lsmain[0].Czybm.ToString()+"'");
+ oCN.RunProc("update Gy_Czygl set Czymc='"+lsmain[0].Czymc.ToString()+ "',Czmm='"+ ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "',Explain='" + lsmain[0].Explain.ToString() + "' ,HEmpID='" + lsmain[0].HEmpID.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString()+"'");
}
else
{
- oCN.RunProc("update Gy_Czygl set Czymc='" + lsmain[0].Czymc.ToString() + "',Explain='" + lsmain[0].Explain.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString() + "'");
+ oCN.RunProc("update Gy_Czygl set Czymc='" + lsmain[0].Czymc.ToString() + "',Explain='" + lsmain[0].Explain.ToString() + "',HEmpID='" + lsmain[0].HEmpID.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
}
- oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1