From 56fcaa1904a933c5f27c5fce65994e8b041e2a6e Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期二, 25 一月 2022 21:36:39 +0800
Subject: [PATCH] 委外加工入库 完善
---
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index 2091013..357293e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -25,18 +25,18 @@
/// </summary>
[Route("Gy_Department/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string Organization)
{
try
{
+ string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
}
else
{
- string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
}
@@ -110,7 +110,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;
@@ -400,7 +400,7 @@
long HEntityID = 1;
//鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
--
Gitblit v1.9.1