From f440eeb72f93587ae29089209710582cda9f384e Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期一, 07 二月 2022 23:21:52 +0800 Subject: [PATCH] 合并 --- WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs index 2185301..c273dd4 100644 --- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs +++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs @@ -32,20 +32,44 @@ { try { - //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄� - bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, false, user); - if (!isCgjl) - { - sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )"; - } - string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere; - ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList"); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; + if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 "; + + if (sWhere=="" || sWhere == null) + { + ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList"); + } + else + { + ds = oCN.RunProcReturn(sql + sWhere, "h_v_IF_POOrderBillList"); + } + + 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) { -- Gitblit v1.9.1