From 9167264eeb081fdbb94d8a1d2f76f35a6ccdd5fe Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 06 四月 2022 11:02:33 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
index 7b7181a..c3041de 100644
--- a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -25,37 +25,35 @@
/// </summary>
[Route("Xt_ORGANIZATIONS/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user, string Organization)
{
try
-
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_ORGANIZATIONSList " + sWhere, "h_v_IF_ORGANIZATIONSList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_ORGANIZATIONSList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkCenter_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
+ string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 缁勭粐鍚嶇О='" + Organization + "'");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by 缁勭粐浠ｇ爜 ", "h_v_IF_ORGANIZATIONSList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = sql1 + sWhere + " order by 缁勭粐浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
}
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -86,12 +84,12 @@
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
-
+
long HParentID = list[0].HParentID;
-
+
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
-
+
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -103,12 +101,12 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
- string sql = "Insert into Xt_ORGANIZATIONS " +
- " (HNumber,HName,HParentID" +
- ",HStopflag" +
+ string sql = "Insert into Xt_ORGANIZATIONS " +
+ " (HNumber,HName,HParentID" +
+ ",HStopflag,HMakeTime" +
",HRemark) " +
" Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
- "," + HStopflag +
+ "," + HStopflag + "getdate()" +
",'" + HRemark + "')";
oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
@@ -151,7 +149,7 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg3 = sArray[1].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
@@ -161,21 +159,21 @@
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
-
+ DateTime HMakeTime = list[0].HMakeTime;
long HParentID = list[0].HParentID;
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
- ////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//if (!DBUtility.ClsPub.AllowNumber(HNumber))
//{
@@ -201,14 +199,14 @@
oCN.BeginTran();
oCN.RunProc("Insert into Xt_ORGANIZATIONS " +
" (HNumber,HName,HParentID" +
- ",HStopflag" +
+ ",HStopflag,HMakeTime" +
",HRemark) " +
" Values('" + HNumber + "','" + HName + "'," + HParentID.ToString() +
- "," + HStopflag +
+ "," + HStopflag + "getdate()" +
",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
else
@@ -219,6 +217,7 @@
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
",HParentID=" + HParentID +
+ ",HMakeTime=" + HMakeTime +
",HStopflag='" + HStopflag + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -246,7 +245,7 @@
/// </summary>
/// <returns></returns>
[Route("DeltetXt_ORGANIZATIONSList")]
-
+
[HttpGet]
public object DeltetXt_ORGANIZATIONSList(string HItemID)
{
@@ -255,7 +254,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
--
Gitblit v1.9.1