From 90948cf3134d20622d7372bd6b6182e25868da65 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Thu, 11 Dec 2025 14:31:08 +0800
Subject: [PATCH 1/3] 111

---
 .../BLL/HJGL/PersonManage/HJGL_PersonManageService.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
index bc782d9..32258b4 100644
--- a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
+++ b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
@@ -72,6 +72,7 @@ namespace BLL
             Model.HJGL_BS_Welder newWelder = db.HJGL_BS_Welder.FirstOrDefault(e => e.WED_ID == welder.WED_ID);
             if (newWelder != null)
             {
+                bool needUpdatePic = false;
                 newWelder.WED_Code = welder.WED_Code;
                 newWelder.WED_Name = welder.WED_Name;
                 newWelder.WED_Unit = welder.WED_Unit;
@@ -94,10 +95,14 @@ namespace BLL
                 newWelder.IsFaceTrain = welder.IsFaceTrain;
                 newWelder.MaxHanTiao = welder.MaxHanTiao;
                 newWelder.MaxWeldingWire = welder.MaxWeldingWire;
-                newWelder.IsOAM = welder.IsOAM; 
-              
+                newWelder.IsOAM = welder.IsOAM;
+                if (newWelder.PhotoUrl != welder.PhotoUrl)
+                {
+                    newWelder.PhotoUrl = welder.PhotoUrl;
+                    needUpdatePic = true;
+                }
                 db.SubmitChanges();
-                if (!string.IsNullOrEmpty(newWelder.PhotoUrl))
+                if (needUpdatePic)
                 {
                     var pw = from x in db.Project_Welder
                              where x.WED_ID == welder.WED_ID

From 80af13e7e44d53ff7c2d529ef991ffc1a99ba307 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Thu, 11 Dec 2025 14:42:04 +0800
Subject: [PATCH 2/3] 11

---
 .../BLL/HJGL/PersonManage/HJGL_PersonManageService.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
index 32258b4..21e5004 100644
--- a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
+++ b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
@@ -73,7 +73,6 @@ namespace BLL
             if (newWelder != null)
             {
                 bool needUpdatePic = false;
-                newWelder.WED_Code = welder.WED_Code;
                 newWelder.WED_Name = welder.WED_Name;
                 newWelder.WED_Unit = welder.WED_Unit;
                 newWelder.EDU_ID = welder.EDU_ID;
@@ -96,11 +95,17 @@ namespace BLL
                 newWelder.MaxHanTiao = welder.MaxHanTiao;
                 newWelder.MaxWeldingWire = welder.MaxWeldingWire;
                 newWelder.IsOAM = welder.IsOAM;
-                if (newWelder.PhotoUrl != welder.PhotoUrl)
+                if (!string.IsNullOrEmpty(welder.PhotoUrl) && newWelder.PhotoUrl != welder.PhotoUrl)
                 {
                     newWelder.PhotoUrl = welder.PhotoUrl;
                     needUpdatePic = true;
                 }
+
+                if (!string.IsNullOrEmpty(welder.WED_Code) && newWelder.WED_Code != welder.WED_Code)
+                {
+                    newWelder.WED_Code = welder.WED_Code;
+                    needUpdatePic = true;
+                }
                 db.SubmitChanges();
                 if (needUpdatePic)
                 {

From a39ac4607a0e388d34824a8e9c1d05aa8fd4101e Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Thu, 11 Dec 2025 15:23:15 +0800
Subject: [PATCH 3/3] 11

---
 .../BLL/HJGL/PersonManage/HJGL_PersonManageService.cs    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
index 21e5004..508fac4 100644
--- a/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
+++ b/HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
@@ -99,13 +99,8 @@ namespace BLL
                 {
                     newWelder.PhotoUrl = welder.PhotoUrl;
                     needUpdatePic = true;
-                }
-
-                if (!string.IsNullOrEmpty(welder.WED_Code) && newWelder.WED_Code != welder.WED_Code)
-                {
-                    newWelder.WED_Code = welder.WED_Code;
-                    needUpdatePic = true;
-                }
+                } 
+                
                 db.SubmitChanges();
                 if (needUpdatePic)
                 {