Merge branch 'develop' into dev-zzj

src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs

@@ -258,7 +258,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins
         [NoOperationLog]
         public async Task<IResultOutput> LoginWithPhoneAsync(AuthLoginWithPhoneInput input)
         {
-            var user = await _appUserRepository.FindAsync(a => a.UnitId.Equals(input.UnitId) && (a.UserName == input.UserName || a.Phone == input.UserName) && a.DataStatus == DataStatusEnum.Normal && (a.ChatPersonType == ChatPersonTypeEnum.Admin || a.ChatPersonType == ChatPersonTypeEnum.Supervisor));
+            var user = await _appUserRepository.FindAsync(a => (input.UnitId == null || a.UnitId.Equals(input.UnitId)) && (a.UserName == input.UserName || a.Phone == input.UserName) && a.DataStatus == DataStatusEnum.Normal && (a.ChatPersonType == ChatPersonTypeEnum.Admin || a.ChatPersonType == ChatPersonTypeEnum.Supervisor));
 
             if (user == null) return ResultOutput.NotOk($"用户不存在,或者无权限登录!");
             user.CId = input.CId;
@@ -421,15 +421,15 @@ namespace ATS.NonCustodial.Application.Impl.Admins
             {
                 new Claim(ClaimAttributes.userId, user.Id.ToString()),
                 new Claim(ClaimAttributes.userName, user.UserName!),
-                new Claim(ClaimAttributes.userUnitId, user.UnitId.ToString()),
-                new Claim(ClaimAttributes.userDeptcodeId, user.DeptcodeId.ToString()),
+                new Claim(ClaimAttributes.userUnitId, user.UnitId?.ToString() ?? ""),
+                new Claim(ClaimAttributes.userDeptcodeId, user.DeptcodeId?.ToString()??""),
                 new Claim(ClaimAttributes.userNickName, user?.NickName??"")  ,
                 new Claim(ClaimAttributes.avatar,user?.Avatar??"")   ,
                 new Claim(ClaimAttributes.roles,JsonConvert.SerializeObject(roles)),
                 new Claim(ClaimAttributes.orgs,JsonConvert.SerializeObject(Array.Empty<long>())) ,
                 new Claim(ClaimAttributes.phone,user?.Phone??""),
                 new Claim(ClaimAttributes.logtime,timeLogin),
-                new Claim(ClaimAttributes.limits,limits),
+                new Claim(ClaimAttributes.limits,limits??""),
                 new Claim(ClaimAttributes.IsAdmin,user.IsAdmin?"true":"false"),
                 new Claim(ClaimAttributes.personType,user?.ChatPersonType.ToString()!)
             });

src/2.services/ATS.NonCustodial.Application/Impl/Business/CaseManagements/AppSupervisedPersonService.cs

@@ -121,15 +121,17 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements
             }
 
             //修改状态
+            var propertyNameAndValues = new Dictionary<long, List<(string propertyName, dynamic propertyValue)>>();
             foreach (var (key, value) in caseProgress)
             {
-                await _appCaseManagementEfRepository.UpdateAsync(w => w.Id == key,
-                    w => new AppCaseManagement()
-                    {
-                        CaseProgress = value,
-                        CaseBeginTime = value == CaseProgressEnum.InExecution ? DateTime.Now : null
-                    });
+                propertyNameAndValues[key] = new List<(string propertyName, dynamic propertyValue)>()
+                {
+                    (nameof(AppCaseManagement.CaseProgress), value),
+                    (nameof(AppCaseManagement.CaseBeginTime), value == CaseProgressEnum.InExecution ? DateTime.Now : (DateTime?)null)
+                };
             }
+            
+            await _appCaseManagementEfRepository.UpdateAsync(propertyNameAndValues);
 
             return ResultOutput.Ok();
         }