gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gaofei:54ba2f172c03a444a322e393da7831e03e4200d2
Branches Tags
gaofei:master
..
compare: gaofei:bfd4b879db766d93a07f57ddc80688ff9b5020d5
Branches Tags
gaofei:master

No commits in common. "54ba2f172c03a444a322e393da7831e03e4200d2" and "bfd4b879db766d93a07f57ddc80688ff9b5020d5" have entirely different histories.
54ba2f172c ... bfd4b879db

1 changed files with 4 additions and 14 deletions
Show Stats Expand all files Collapse all files

18
HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs
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)
{ {
bool needUpdatePic = false; newWelder.WED_Code = welder.WED_Code;
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,20 +94,10 @@ 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 (needUpdatePic) if (!string.IsNullOrEmpty(newWelder.PhotoUrl))
{ {
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