diff --git a/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs b/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs index 4692120b..7fac09f9 100644 --- a/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs @@ -163,7 +163,7 @@ namespace BLL { if (getTestPlan.TestEndTime > DateTime.Now) { - var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == getTestPlan.TestPlanId && x.UserType == testRecord.UserType); + var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == getTestPlan.TestPlanId && (x.UserType == testRecord.UserType || x.UserType == null)); if (getTestPlanTraining.Count() > 0) { int cout1 = getTestPlanTraining.Sum(x => x.TestType1Count ?? 0); @@ -294,7 +294,7 @@ namespace BLL var item = db.Test_TestRecordItem.FirstOrDefault(x => x.TestRecordId == testRecordId); if (item == null) { - var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == testPlanId && x.UserType == getTestRecord.ManType); + var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == testPlanId && (x.UserType == getTestRecord.ManType || x.UserType == null)); if (getTestPlanTraining.Count() > 0) { List getTestTrainingItemList = new List(); diff --git a/SGGL/FineUIPro.Web/PersonManage/Test/TestPlanEdit.aspx b/SGGL/FineUIPro.Web/PersonManage/Test/TestPlanEdit.aspx index 93f8f0b2..320ff697 100644 --- a/SGGL/FineUIPro.Web/PersonManage/Test/TestPlanEdit.aspx +++ b/SGGL/FineUIPro.Web/PersonManage/Test/TestPlanEdit.aspx @@ -94,7 +94,7 @@ - + diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index b8b6feab..d0b44dec 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -353,9 +353,9 @@ True True - 7040 + 0 / - http://localhost:7040/ + http://localhost:3070/ False False