Compare commits

...

3 Commits

Author SHA1 Message Date
李超 54ba2f172c Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS 2025-12-11 14:42:16 +08:00
李超 80af13e7e4 11 2025-12-11 14:42:04 +08:00
李超 90948cf313 111 2025-12-11 14:31:08 +08:00
1 changed files with 14 additions and 4 deletions

View File

@ -72,7 +72,7 @@ namespace BLL
Model.HJGL_BS_Welder newWelder = db.HJGL_BS_Welder.FirstOrDefault(e => e.WED_ID == welder.WED_ID); Model.HJGL_BS_Welder newWelder = db.HJGL_BS_Welder.FirstOrDefault(e => e.WED_ID == welder.WED_ID);
if (newWelder != null) if (newWelder != null)
{ {
newWelder.WED_Code = welder.WED_Code; bool needUpdatePic = false;
newWelder.WED_Name = welder.WED_Name; newWelder.WED_Name = welder.WED_Name;
newWelder.WED_Unit = welder.WED_Unit; newWelder.WED_Unit = welder.WED_Unit;
newWelder.EDU_ID = welder.EDU_ID; newWelder.EDU_ID = welder.EDU_ID;
@ -94,10 +94,20 @@ namespace BLL
newWelder.IsFaceTrain = welder.IsFaceTrain; newWelder.IsFaceTrain = welder.IsFaceTrain;
newWelder.MaxHanTiao = welder.MaxHanTiao; newWelder.MaxHanTiao = welder.MaxHanTiao;
newWelder.MaxWeldingWire = welder.MaxWeldingWire; newWelder.MaxWeldingWire = welder.MaxWeldingWire;
newWelder.IsOAM = welder.IsOAM; newWelder.IsOAM = welder.IsOAM;
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(); db.SubmitChanges();
if (!string.IsNullOrEmpty(newWelder.PhotoUrl)) if (needUpdatePic)
{ {
var pw = from x in db.Project_Welder var pw = from x in db.Project_Welder
where x.WED_ID == welder.WED_ID where x.WED_ID == welder.WED_ID