duhe
2023-11-10 b5259578bcc4bc648d281ba0d5468ab408e3f675
WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -32,50 +32,50 @@
            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, "h_v_IF_EntrustOrderBillList");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql1+ sWhere, "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");
                if (ds.Tables[0].Rows.Count == 0 || ds == null)
                //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)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无记录";
                    objJsonResult.data = null;
                    return objJsonResult;
                    sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                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)
                //{
                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)
            {