diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs index 9e58f9a..a5f3738 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs @@ -226,6 +226,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill var temp = new JoinAlias(typeof(TempPackage)); var temp2 = new JoinAlias(typeof(TempPackage2)); var dom = new DQueryDom(goods); + OrganizationUtil.RegisterOrganizationQueryTable(dom); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(goods, "ID"), "Goods_ID")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(goods, "Name"), "产品")); if (configured) @@ -264,7 +265,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill dom.RegisterQueryTable(typeof(TempPackage), new[] { "Goods_ID" }, GetTempDom()); dom.From.AddJoin(JoinType.Left, new DQDmoSource(temp), DQCondition.EQ(temp, "Goods_ID", goods, "ID")); dom.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field(temp, "Goods_ID"))); - } + } if (!string.IsNullOrEmpty(_goodsDfc.Value)) { dom.Where.Conditions.Add(DQCondition.EQ("ID", _goodsDfc.Value)); @@ -324,8 +325,8 @@ namespace BWP.Web.Pages.B3YunKen.Bill { dom.Where.Conditions.Add(DQCondition.EQ(acc, "ID", _accountingUnitDfc.Value)); } - //AuthorizeUtil.AddOrganizationAuthorising(dom, new KeyValuePair("acc", "Organization_ID")); - //OrganizationUtil.AddOrganizationLimit(dom, typeof(AccountingUnit), acc); + //AuthorizeUtil.AddOrganizationAuthorising(dom, new KeyValuePair("acc", "Organization_ID")); + OrganizationUtil.AddOrganizationLimit(dom, typeof(AccountingUnit), acc); return dom; }