From 419320e3540ad93c5e7d8620dd9cd7e334eb7c4a Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Mon, 14 Nov 2022 18:35:17 +0800
Subject: [PATCH] =?UTF-8?q?20221114=E7=9F=A5=E8=AF=86=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B=E6=8A=BD=E5=8F=96=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/API/HSSE/APIServerTestRecordService.cs        | 4 ++--
 SGGL/FineUIPro.Web/PersonManage/Test/TestPlanEdit.aspx | 2 +-
 SGGL/WebAPI/WebAPI.csproj                              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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<Model.Training_TestTrainingItem> getTestTrainingItemList = new List<Model.Training_TestTrainingItem>();
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 @@
                         <f:FormRow>
                             <Items>
                                 <f:HiddenField runat="server" ID="hdTestPlanTrainingId"></f:HiddenField>
-                                <f:DropDownList runat="server" ID="drpUserType" Label="人员" LabelWidth="90px">
+                                <f:DropDownList runat="server" ID="drpUserType" Label="按人员类型" LabelWidth="90px" ShowRedStar="true">
                                     <f:ListItem Text="管理人员" Value="1" />
                                     <f:ListItem Text="临时用户" Value="2" />
                                     <f:ListItem Text="作业人员" Value="3" />
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 @@
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7040</DevelopmentServerPort>
+          <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7040/</IISUrl>
+          <IISUrl>http://localhost:3070/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>