From f4fa0cd3ae3b6f4e67671cdb1fe8ed52259341fb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 19 八月 2022 14:48:05 +0800
Subject: [PATCH] 用户关联
---
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index 3e3e33f..f8868b1 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -32,7 +32,7 @@
try
{
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -43,30 +43,31 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckItemList " + sWhere, "h_v_IF_QCCheckItemList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckItemList order by 浠ｇ爜", "h_v_IF_QCCheckItemList");
}
else
{
string sql1 = "select * from h_v_IF_QCCheckItemList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 浠ｇ爜";
ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckItemList");
}
- 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)
{
@@ -136,6 +137,7 @@
DAL.ClsGy_QCCheckItem_View oDeptHlp = new DAL.ClsGy_QCCheckItem_View();
try
{
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
@@ -304,8 +306,18 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
+ string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚�
string msg5 = sArray[3].ToString();
+
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -321,18 +333,6 @@
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
bool HUseFlag = list[0].HUseFlag;
-
-
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, false, msg4))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
--
Gitblit v1.9.1