From 9c2e72506b26c2ca3fa6a57f812f3227c7eea04a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 8 Apr 2026 17:21:11 +0800
Subject: [PATCH] 1

---
 SGGL/BLL/Common/Const.cs                                  | 5 +++++
 SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs | 2 +-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj                   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

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>