From 3e148fa2efbd3bd0309712e16c905b5de921f7d1 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sun, 14 May 2023 21:22:40 +0800
Subject: [PATCH] commit by yzf

---
 FactorySystemBll/ViewBll.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs
index 0accab6..7f89acb 100644
--- a/FactorySystemBll/ViewBll.cs
+++ b/FactorySystemBll/ViewBll.cs
@@ -38,7 +38,7 @@ namespace FactorySystemBll
                 viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
                     new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
                    .Where((a, b) => a.FTeamID == teamId)
-                   //.WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
+                   .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
                    .WhereIF(viewType > 0, (a, b) => a.FViewType == viewType)
                    .Select<object>("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," +
                    "b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," +
@@ -49,7 +49,7 @@ namespace FactorySystemBll
                 viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
                     new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
                    .Where((a, b) => a.FTeamID == teamId)
-                   //.WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
+                   .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
                    .Select<object>("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," +
                    "b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," +
                    "b.FQualityTest1,b.FQualityTest2").ToDictionaryList();
@@ -80,7 +80,7 @@ namespace FactorySystemBll
                 viewList = db.Queryable<TFS_ViewMaterial, TFS_Material>((a, b) =>
                  new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
                .Where((a, b) => a.FTeamID == teamId)
-               //.WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
+               .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
                .WhereIF(viewType > 0, (a, b) => a.FViewType == 1)
                .Select<object>("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," +
                 "b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," +