diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs
index 946fe329..68923901 100644
--- a/SGGL/BLL/API/APIPersonService.cs
+++ b/SGGL/BLL/API/APIPersonService.cs
@@ -441,7 +441,7 @@ namespace BLL
                                && (strWorkPostId == null || x.WorkPostId == strWorkPostId)
                                && x.States == states
                                select x;
-                if (unitId != Const.UnitId_SEDIN && !string.IsNullOrEmpty(unitId))
+                if (unitId != Const.UnitId_SEDIN && unitId != Const.UnitId_SEDINNB && !string.IsNullOrEmpty(unitId))
                 {
                     getViews = getViews.Where(x => x.UnitId == unitId);
                 }
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 7cd3157b..5c0db85a 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -375,6 +375,11 @@ namespace BLL
         /// </summary>
         public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228";
 
+        /// <summary>
+        /// 焊工岗位Id
+        /// </summary>
+        public static string WorkPost_Welder2 = "2121c01d-b0ef-487c-ac26-1b18109daf05";
+
         /// <summary>
         /// 无损检测工岗位Id
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
index f7260c40..cd7bad9f 100644
--- a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
@@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
                 rootNode.Text = item.UnitName;
                 rootNode.EnableClickEvent = true;
                 this.tvControlItem.Nodes.Add(rootNode);
-                var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.UnitId == item.UnitId select x).ToList();
+                var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && (x.WorkPostId == Const.WorkPost_Welder || x.WorkPostId == Const.WorkPost_Welder2) && x.UnitId == item.UnitId select x).ToList();
                 if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
                 {
                     getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d98a37e8..5971df32 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -17019,7 +17019,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   
  
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
  
   <ProjectExtensions>
     <VisualStudio>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs
index b32bcf94..c26322a2 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordIn.aspx.cs
@@ -127,33 +127,33 @@
             try
             {
                 viewTrainRecordDetails.Clear();
-                string oleDBConnString = String.Empty;
-                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
-                oleDBConnString += "Data Source=";
-                oleDBConnString += fileName;
-                oleDBConnString += ";Extended Properties=Excel 8.0;";
-                OleDbConnection oleDBConn = null;
-                OleDbDataAdapter oleAdMaster = null;
-                DataTable m_tableName = new DataTable();
-                DataSet ds = new DataSet();
+                //string oleDBConnString = String.Empty;
+                //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                //oleDBConnString += "Data Source=";
+                //oleDBConnString += fileName;
+                //oleDBConnString += ";Extended Properties=Excel 8.0;";
+                //OleDbConnection oleDBConn = null;
+                //OleDbDataAdapter oleAdMaster = null;
+                //DataTable m_tableName = new DataTable();
+                //DataSet ds = new DataSet();
 
-                oleDBConn = new OleDbConnection(oleDBConnString);
-                oleDBConn.Open();
-                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+                //oleDBConn = new OleDbConnection(oleDBConnString);
+                //oleDBConn.Open();
+                //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
 
-                if (m_tableName != null && m_tableName.Rows.Count > 0)
-                {
-                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
-                }
-                string sqlMaster;
-                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
-                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
-                oleAdMaster.Fill(ds, "m_tableName");
-                oleAdMaster.Dispose();
-                oleDBConn.Close();
-                oleDBConn.Dispose();
-
-                AddDatasetToSQL(ds.Tables[0]);
+                //if (m_tableName != null && m_tableName.Rows.Count > 0)
+                //{
+                //    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+                //}
+                //string sqlMaster;
+                //sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                //oleAdMaster.Fill(ds, "m_tableName");
+                //oleAdMaster.Dispose();
+                //oleDBConn.Close();
+                //oleDBConn.Dispose();
+                DataTable dt = NPOIHelper.ExcelToDataTable1(fileName);
+                AddDatasetToSQL(dt);
             }
             catch (Exception ex)
             {