Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -15,7 +15,6 @@ using Medallion.Threading;
 using EasyCaching.Core;
 using IRaCIS.Core.Application.Contracts;
 using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
-using OfficeOpenXml.FormulaParsing.Utilities;
 
 namespace IRaCIS.Application.Services
 {
@@ -124,14 +123,17 @@ namespace IRaCIS.Application.Services
             {
 				throw new BusinessValidationFailedException(_localizer["User_PassWordRepeat"]);
 			}
-
-            await _userPassWordLogRepository.AddAsync(new UserPassWordLog()
+            if (oldPwd != null)
             {
+				await _userPassWordLogRepository.AddAsync(new UserPassWordLog()
+				{
 
-                CreateTime = DateTime.Now,
-                PassWord = oldPwd,
-                UserId = userId,
-            });
+					CreateTime = DateTime.Now,
+					PassWord = oldPwd,
+					UserId = userId,
+				});
+			}
+          
 
             await _userRepository.BatchUpdateNoTrackingAsync(x => x.Id == userId, x => new User()
             {
@@ -153,7 +155,7 @@ namespace IRaCIS.Application.Services
         {
 
             //检查手机或者邮箱是否有效
-            if (!Regex.IsMatch(email, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
+            if (!Regex.IsMatch(email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
             {
                 //---Please input a legal email
                 return ResponseOutput.NotOk(_localizer["User_LegalEmail"]);
@@ -335,7 +337,7 @@ namespace IRaCIS.Application.Services
         {
 
             //检查手机或者邮箱是否有效
-            if (!Regex.IsMatch(email, @"^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$"))
+            if (!Regex.IsMatch(email, @"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"))
             {
 
                 //---请输入一个正确的邮箱。

IRaCIS.Core.Application/Service/Management/UserTypeService.cs

@@ -165,6 +165,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// <returns></returns>
         public async Task<List<TrialUserType>> GetTrialUserTypeList()
         {
+            //排除其他组的用户
             var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
                .Where(t => !t.UserTypeGroupList.Any(t=> t.Group.Code=="3"))
                .OrderBy(t => t.UserTypeShortName).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);