Merge branch 'master' of http://47.104.102.122:3000/xiaju/SGGL_JT

SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj

@@ -18538,7 +18538,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs

@@ -335,12 +335,20 @@ namespace FineUIPro.Web.HSSE.SitePerson
                         if (!string.IsNullOrEmpty(birthDateStr))
                         {
                             // 解析日期字符串为DateTime对象
+                            try
+                            {
                                 var birthDate = DateTime.ParseExact(birthDateStr, "yyyyMMdd", null);
                                 if (birthDate.AddYears(60) < DateTime.Now)
                                 {
                                     Grid1.Rows[i].RowCssClass = "Yellow";
                                 }
                             }
+                            catch (Exception ex)
+                            {
+                                ErrLogInfo.WriteLog($"{person.PersonName}身份证号码异常：{idCard}；");
+                                continue;
+                            }
+                        }
                     }
                     // if (person.IsUsedType=="2") //待审批
                     // {