lpf
/
xinjiang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lpf:0075a58d429410fc5ec5036f6002053abaa79496
Branches Tags
lpf:master
..
compare: lpf:cc86d5a07e6abbe80e6dec0311cd45fb90494b80
Branches Tags
lpf:master

No commits in common. "0075a58d429410fc5ec5036f6002053abaa79496" and "cc86d5a07e6abbe80e6dec0311cd45fb90494b80" have entirely different histories.
0075a58d42 ... cc86d5a07e

3 changed files with 18 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
View File

@ -68,10 +68,12 @@ namespace FineUIPro.Web.BaseInfo
{ {
rowend = source.Count(); rowend = source.Count();
} }
for (int i = rowbegin; i < rowend; i++) for (int i = rowbegin; i < rowend; i++)
{ {
paged.Add(source[i]); paged.Add(source[i]);
} }
return paged; return paged;
} }

6
SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs
View File

@ -71,9 +71,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
strSql += " AND p.PersonId = @PersonId"; strSql += " AND p.PersonId = @PersonId";
listStr.Add(new SqlParameter("@PersonId", this.PersonId)); listStr.Add(new SqlParameter("@PersonId", this.PersonId));
} }
if (!string.IsNullOrEmpty(txtName.Text.Trim())) if (!string.IsNullOrEmpty(txtName.Text.Trim()))
{ {
strSql += " AND p.PersonName like '%" + txtName.Text.Trim() + "%'"; strSql += " AND p.PersonName like '%"+ txtName.Text.Trim() + "%'";
} }
if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
{ {
@ -228,8 +229,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
{ {
return (Convert.ToInt32(time) / 60).ToString(); return (Convert.ToInt32(time) / 60).ToString();
} }
else else {
{
return hours; return hours;
} }

10
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
View File

@ -546,9 +546,9 @@ namespace FineUIPro.Web.HSSE.SitePerson
//if (!BLL.PersonService.IsExistPersonByUnit(this.UnitId, this.txtPersonName.Text.Trim(), this.ProjectId)) //if (!BLL.PersonService.IsExistPersonByUnit(this.UnitId, this.txtPersonName.Text.Trim(), this.ProjectId))
//{ //{
this.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person)); this.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
person.PersonId = this.PersonId; person.PersonId = this.PersonId;
BLL.PersonService.AddPerson(person); BLL.PersonService.AddPerson(person);
//} //}
BLL.LogService.AddSys_Log(this.CurrUser, person.PersonName, person.PersonId, BLL.Const.PersonListMenuId, BLL.Const.BtnAdd); BLL.LogService.AddSys_Log(this.CurrUser, person.PersonName, person.PersonId, BLL.Const.PersonListMenuId, BLL.Const.BtnAdd);
@ -613,8 +613,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
var user = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == person.IdentityCard); var user = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == person.IdentityCard);
if (user != null && user.UnitId != person.UnitId) if (user!=null && user.UnitId != person.UnitId)
{ {
user.UnitId = person.UnitId; user.UnitId = person.UnitId;
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();