From e9e530471d536197ae7b620eb9e6ccda19453a30 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 29 三月 2022 13:23:56 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index b316bd1..124559c 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -36,22 +36,23 @@
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_UserList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -76,7 +77,7 @@
try
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_UserByUserRelation_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log("Gy_UserByUserRelation_Delete", 1, false, DBUtility.ClsPub.CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -130,7 +131,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 +163,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;
@@ -261,7 +260,7 @@
lsmain = oListModels.getObjectByJson_Gy_UserSupper(msg2);
oCN.BeginTran();
//鍒犻櫎宸茬粡鍏宠仈鐨勬暟鎹�
- oCN.RunProc("Delete From Gy_UserSupplierRelation where HUserID=" + msg3.ToString());
+ oCN.RunProc("Delete From Gy_UserSupplierRelation where HUserID='" + msg3.ToString() + "'");
foreach (Models.Gy_UserSupper oItem in lsmain)
{
//閲嶆柊鍐欏叆鍏宠仈鏁版嵁
--
Gitblit v1.9.1