xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目用户添加是否教育人字段

Browse Source
This commit is contained in:
geh
2026-01-20 16:34:07 +08:00
parent 9555acd424
commit 96ca57977d
11 changed files with 131 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs
+1 -1
View File
@@ -210,7 +210,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
strSql += " AND TrainRecord.UnitIds LIKE @UnitId1";
listStr.Add(new SqlParameter("@UnitId1", "%" + this.CurrUser.UnitId + "%"));
}
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
if (this.drpUnitId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitId.SelectedValue))
{
strSql += " AND TrainRecord.UnitIds LIKE @UnitIds";
listStr.Add(new SqlParameter("@UnitIds", "%" + this.drpUnitId.SelectedValue.Trim() + "%"));
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+8 -2
View File
@@ -850,7 +850,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
var person = Funs.DB.View_SitePerson_Person.FirstOrDefault(x => x.PersonId == Grid1.SelectedRowID);
var personData = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == Grid1.SelectedRowID);
// var personData = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == Grid1.SelectedRowID);
if (person != null)
{
@@ -1023,6 +1023,12 @@ namespace FineUIPro.Web.HSSE.SitePerson
List<Training_TestRecordItem> getSingleItem = new List<Training_TestRecordItem>();
List<Training_TestRecordItem> getMultipleItem = new List<Training_TestRecordItem>();
List<Training_TestRecordItem> getIsTrueItem = new List<Training_TestRecordItem>();
Project_ProjectUser newProjectUser = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IsEducator == true);
if (newProjectUser != null)
{
sign = UserService.GetUserNameByUserId(newProjectUser.UserId);
}
if (gTrainingTestRecord != null)
{
testName = person.PersonName;
@@ -1030,7 +1036,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
Signature = gTrainingTestRecord.Signature;
TestScores = gTrainingTestRecord.TestScores;
TestStartTime = gTrainingTestRecord.TestStartTime;
sign = gTrainingTestRecord.PlanManName;
// sign = gTrainingTestRecord.PlanManName;
dateTime1 = gTrainingTestRecord.TestStartTime.Value;