From 2fd658134344c18e9f2a2eb2c2099d0b0edf205a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 25 三月 2026 16:08:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_DriverController.cs | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DriverController.cs b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
index 23a5d65..e0909ac 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DriverController.cs
@@ -37,15 +37,15 @@
try
{
List<object> columnNameList = new List<object>();
- ////鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_Driver_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
string sql1 = string.Format(@"select * from h_v_Gy_driver where 1=1 ");
if (sWhere == null || sWhere.Equals(""))
@@ -232,14 +232,14 @@
try
{
////鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Gy_Department_Delete", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_Driver_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
@@ -479,7 +479,7 @@
//string msg5 = sArray[3].ToString();
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Driver_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -501,7 +501,7 @@
string HHelpCode = list[0].HHelpCode;
string HModifyEmp = msg3;
string HMakeEmp = msg3;
- bool HStopflag = list[0].HStopflag==null?false:true;
+ int HStopflag = list[0].HStopflag==0?0:1;
long HCREATEORGID = list[0].HCREATEORGID;
long HUSEORGID = HUSEORGID_1;
long HCompID = list[0].HCompID;
@@ -577,7 +577,7 @@
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime,HIDCard,HPhone,HDriverCardPic,HDriverCardType,HIDCardPic,HEmpType,HCompID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HStopflag + ",'" + HRemark + "'" +
"," + HUSEORGID + "," + HCREATEORGID + ",'" + msg3 + "',getdate()," +"'"+ HIDCard +"',"+
"'"+ HPhone+"','"+ HDriverCardPic+"','"+ HDriverCardType + "','"+ HIDCardPic +"','"+ HEmpType+"',"+ HCompID+
")", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -611,7 +611,7 @@
",HParentID=" + HParentID +
",HUSEORGID=" + HUSEORGID.ToString() +
",HCREATEORGID=" + HCREATEORGID.ToString() +
- ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ ",HStopflag=" + HStopflag +
",HModifyEmp='" + HModifyEmp + "'" +
",HModifyTime='" + DateTime.Now + "'" +
",HIDCard='" + HIDCard + "'" +
@@ -621,7 +621,6 @@
",HIDCardPic='" + HIDCardPic + "'" +
",HEmpType='" + HEmpType + "'" +
",HCompID=" + HCompID + "" +
-
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
@@ -989,15 +988,15 @@
{
try
{
- ////瀹℃牳鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Check", 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Driver_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
var ds = oCN.RunProcReturn("select * from Gy_Driver where HItemID=" + HInterID, "Gy_Driver");
if (ds.Tables[0].Rows.Count > 0)
--
Gitblit v1.9.1