From fefbefe7b1ba081283487f51dbc71ed1fa9b4caf Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 01 十二月 2023 14:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index 6fe24ad..a31ef73 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -292,7 +292,7 @@
{
List<object> columnNameList = new List<object>();
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_BadReason", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_BadType_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -301,16 +301,9 @@
return objJsonResult;
}
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere + " order by 涓嶈壇鍘熷洜浠ｇ爜 ", "h_v_IF_BadReasonList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1";
- string sql = sql1 + sWhere + " order by 涓嶈壇鍘熷洜浠ｇ爜 ";
- ds = oCN.RunProcReturn(sql, "h_v_IF_BadReasonList");
- }
+ string sql1 = "select * from h_v_gy_BadTypeList where 1 = 1";
+ string sql = sql1 + sWhere + " order by 涓嶈壇绫诲瀷浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_gy_BadTypeList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1