From 324ef1c8b14c07d1a6676c37d42ec5971d905064 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 10 二月 2022 17:43:49 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 3d1cc34..3979335 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -42,12 +42,12 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_WorkCenterList " + sWhere, "h_v_WorkCenterList");
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterList order by 宸ヤ綔涓績浠ｇ爜 ", "h_v_WorkCenterList");
}
else
{
string sql1 = "select * from h_v_WorkCenterList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 宸ヤ綔涓績浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -243,6 +243,17 @@
string msg2 = sArray[1].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
@@ -456,7 +467,6 @@
{
DataSet ds;
DataSet ds1;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
//鍒犻櫎鏉冮檺
--
Gitblit v1.9.1