From b0c29a051b101921da5e757cae7250f92e878d41 Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期三, 06 四月 2022 16:58:58 +0800 Subject: [PATCH] 采购订单委外订单 安瑞采购经理职位查看权限 --- WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 57 +++++++++++++--------------- WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs | 50 ++++++++++++------------ 2 files changed, 52 insertions(+), 55 deletions(-) diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs index 352007a..b076c66 100644 --- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs +++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs @@ -34,42 +34,39 @@ { //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� - 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+ " order by hmainid desc", "h_v_IF_POOrderBillList"); - } - else - { - ds = oCN.RunProcReturn(sql + sWhere+ " order by hmainid desc", "h_v_IF_POOrderBillList"); - } - - //if (ds.Tables[0].Rows.Count != 0 || ds != null) + //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+ " order by hmainid desc", "h_v_IF_POOrderBillList"); + //} + //else + //{ + // ds = oCN.RunProcReturn(sql + sWhere+ " order by hmainid desc", "h_v_IF_POOrderBillList"); + //} + + //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛� + bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, 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; - //} - //else - //{ - //objJsonResult.code = "0"; - //objJsonResult.count = 0; - //objJsonResult.Message = "鏃犳暟鎹�"; - //objJsonResult.data = null; - //return objJsonResult; - //} - } catch (Exception e) { diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs index 11301fe..e168699 100644 --- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs +++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs @@ -32,33 +32,33 @@ try { //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� - if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; - objJsonResult.data = null; - return objJsonResult; - } - - string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 "; - if (sWhere == null || sWhere.Equals("")) - { - ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList"); - } - else - { - ds = oCN.RunProcReturn(sql1+ sWhere+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList"); - } - - ////鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄� - //bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user); - //if (!isCgjl) + //if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user)) //{ - // sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )"; + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + // objJsonResult.data = null; + // return objJsonResult; //} - //string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere; - //ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList"); + + //string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 "; + //if (sWhere == null || sWhere.Equals("")) + //{ + // ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList"); + //} + //else + //{ + // ds = oCN.RunProcReturn(sql1+ sWhere+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList"); + //} + + //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛� + bool isCgjl = Security_Log("WW_EntrustOrderBill_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_EntrustOrderBillList where 1 = 1 " + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList"); //if (ds.Tables[0].Rows.Count != 0 || ds != null) //{ -- Gitblit v1.9.1