From bd443a23270ae3b33f30b8fdeb20b3ae2551cce2 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 13 十月 2021 17:36:12 +0800
Subject: [PATCH] 器具管理所有页面列表加登录组织过滤
---
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index a27164f..7c75a5d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -319,7 +319,7 @@
[Route("Sc_MouldScrapInBill/get_Display")]
[HttpGet]
- public object get_Display(string sWhere,string user)
+ public object get_Display(string sWhere,string user, string Organization)
{
try
{
@@ -333,7 +333,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldScrapInHouseBill(sWhere);
+ ds = Sc_GetMouldScrapInHouseBill(sWhere,Organization);
if (ds == null)
{
objJsonResult.code = "0";
@@ -361,16 +361,16 @@
}
}
- public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere)
+ public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapInHouseBillList " + sWhere, "h_v_Sc_MouldScrapInHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapInHouseBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
}
--
Gitblit v1.9.1