diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs index e6e2702f..0912557b 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs @@ -72,21 +72,21 @@ namespace FineUIPro.Web.HJGL.DataImport List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} //var dbpipeLineMat = from x in Funs.DB.HJGL_PipeLineMat select x; //var DBpipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x; if (unitWork1.Count() > 0) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs index 5699c6a8..73e8f774 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs @@ -78,21 +78,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var TrustItemList = (from x in Funs.DB.HJGL_Hard_TrustItem join y in Funs.DB.HJGL_Hard_Trust on x.HardTrustID equals y.HardTrustID where y.ProjectId == this.CurrUser.LoginProjectId diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs index 85183bb1..9118787b 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs @@ -111,21 +111,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var ReportList = (from x in Funs.DB.HJGL_HotProess_Report join y in Funs.DB.HJGL_HotProess_TrustItem on x.HotProessTrustItemId equals y.HotProessTrustItemId join z in Funs.DB.HJGL_HotProess_Trust on y.HotProessTrustId equals z.HotProessTrustId diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs index d571d558..7ca825c2 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var TrustItemList = (from x in Funs.DB.HJGL_HotProess_TrustItem join y in Funs.DB.HJGL_HotProess_Trust on x.HotProessTrustId equals y.HotProessTrustId where y.ProjectId == this.CurrUser.LoginProjectId diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs index d1cfd2c7..25df1a1e 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs @@ -113,21 +113,21 @@ namespace FineUIPro.Web.HJGL.HotProcessHard List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} var WeldJointList = (from x in Funs.DB.HJGL_WeldJoint join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId where x.ProjectId == this.CurrUser.LoginProjectId && x.WeldingDailyId != null && x.IsHotProess == true diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 5c8e25a8..6fb7b129 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -134,21 +134,21 @@ namespace FineUIPro.Web.HJGL.InfoQuery List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs index eb6d3121..d113bbc9 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs @@ -81,21 +81,21 @@ namespace FineUIPro.Web.HJGL.InfoQuery List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs index 9db9ffd7..f2b88799 100644 --- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs @@ -79,21 +79,21 @@ namespace FineUIPro.Web.HJGL.LeakVacuum List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs index df2fff4c..1357380d 100644 --- a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs @@ -136,21 +136,21 @@ namespace FineUIPro.Web.HJGL.NDT List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs index f9dd6429..aab12ce5 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.PointTrust List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs index ff88dc8f..b635ce52 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs @@ -57,21 +57,21 @@ namespace FineUIPro.Web.HJGL.PointTrust List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs index 0f9f6abb..dec1a23c 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageIn.aspx.cs @@ -403,7 +403,10 @@ namespace FineUIPro.Web.HJGL.PreDesign materialCheck.ProjectId = this.CurrUser.LoginProjectId; materialCheck.ContractNo = pds.Rows[i][0].ToString().Trim(); materialCheck.UnitId = units.First(e => e.UnitName == pds.Rows[i][1].ToString().Trim()).UnitId; - materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId; + if (mainItems.FirstOrDefault(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()) != null) + { + materialCheck.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId; + } materialCheck.MaterialName = pds.Rows[i][3].ToString().Trim(); materialCheck.SpecificationAndModel = pds.Rows[i][4].ToString().Trim(); materialCheck.MaterialCode = pds.Rows[i][5].ToString().Trim(); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index 8aa0fe9a..be81ca9e 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -98,21 +98,21 @@ namespace FineUIPro.Web.HJGL.PreDesign List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 3ebbaf32..cd01605b 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -65,21 +65,21 @@ namespace FineUIPro.Web.HJGL.PreDesign List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs index 1fdc5cf8..a2c36c67 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs @@ -99,21 +99,21 @@ namespace FineUIPro.Web.HJGL.PreDesign List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs index d6b5156e..c2d32771 100644 --- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs index 96b4452f..21cbc5bd 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs @@ -180,21 +180,21 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs index 5ea454a7..6ba7cdb4 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs @@ -55,21 +55,21 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs index 8846eaec..03aff233 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs @@ -99,21 +99,21 @@ namespace FineUIPro.Web.HJGL.TestPackage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs index 8a576ba4..2f560e8b 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs @@ -92,21 +92,21 @@ namespace FineUIPro.Web.HJGL.TestPackage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs index 2f5ead1a..92eb0d36 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs @@ -142,21 +142,21 @@ List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs index b2030a7f..c740f07f 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs @@ -100,21 +100,21 @@ namespace FineUIPro.Web.HJGL.TestPackage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index 3f719833..88e201d5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -63,21 +63,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 9528b728..76bcebb3 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -100,20 +100,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork2 = null; // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index f39873ec..bd909b93 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -80,21 +80,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs index 8460014d..6d985624 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs @@ -59,21 +59,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs index 1ee2fd29..b45da0d1 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs @@ -101,21 +101,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { foreach (var q in unitWork1) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs index 7e351f38..2df80bc0 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs @@ -56,21 +56,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs index baa10565..f6e51e41 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs @@ -63,21 +63,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage List unitWork1 = null; List unitWork2 = null; - // 当前为施工单位，只能操作本单位的数据 - if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) - { - unitWork1 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" - select x).ToList(); - unitWork2 = (from x in unitWorkList - where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" - select x).ToList(); - } - else - { + //// 当前为施工单位，只能操作本单位的数据 + //if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2) + //{ + // unitWork1 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1" + // select x).ToList(); + // unitWork2 = (from x in unitWorkList + // where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2" + // select x).ToList(); + //} + //else + //{ unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); - } + //} if (unitWork1.Count() > 0) {