From 39965ac16351d5b814ea4cdaf8017695ba42530f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 13:36:19 +0800
Subject: [PATCH] 修改了选机台直接根据系统登录人员过滤功能
---
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 740e4cf..5724165 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -50,22 +50,23 @@
string sql = sql1 + sWhere+ " order by 宸ヤ綔涓績浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -245,7 +246,7 @@
//string msg5 = sArray[3].ToString();
//鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -467,7 +468,6 @@
{
DataSet ds;
DataSet ds1;
- string ModRightNameCheck = "Gy_WorkCenter_Delete";
try
{
//鍒犻櫎鏉冮檺
--
Gitblit v1.9.1