1

HJGL_DS/BLL/Common/BaseInfo/Base_UnitService.cs

@@ -221,6 +221,22 @@
             return q;
         }
 
+        /// <summary>
+        /// 根据单位id获取单位信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="unitType">一个单位有可能多种类型</param>
+        /// <returns></returns>
+        public static List<Model.Base_Unit> GetAllUnits2()
+        {
+            var q = (from x in Funs.DB.Base_Unit
+                     join y in Funs.DB.HJGL_BS_Welder on x.UnitId equals y.WED_Unit
+                     where y.IsOAM == true
+                     orderby x.UnitCode
+                     select x).Distinct().ToList();
+            return q;
+        }
+
         /// <summary>
         /// 根据分包本单位类型ID获取单位项
         /// </summary>

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs

@@ -23,7 +23,7 @@
             if (!IsPostBack)
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
-                var pUnit = BLL.Base_UnitService.GetAllUnits();
+                var pUnit = BLL.Base_UnitService.GetAllUnits2();
                 ///单位
                 this.drpUnit.DataTextField = "UnitName";
                 this.drpUnit.DataValueField = "UnitId";