Browse Source

Merge branch 'feature/snapshot' into test

qinchaoyue 9 hours ago
parent
commit
b4d1f6115e

+ 1 - 1
src/Hotline.Application/Snapshot/SnapshotUserApplication.cs

@@ -108,7 +108,7 @@ public class SnapshotUserApplication : ISnapshotUserApplication, IScopeDependenc
             .LeftJoin<ThirdAccount>((citizen, third) => citizen.Id == third.ExternalId)
             .LeftJoin<CitizenRelationSafetyType>((citizen, third, relation) => relation.CitizenId == citizen.Id)
             .WhereIF(dto.PhoneNumber.NotNullOrEmpty(), (citizen, third) => citizen.PhoneNumber.Contains(dto.PhoneNumber))
-            .WhereIF(dto.SafteyTypeId.NotNullOrEmpty(), (citizen, third, relation) => relation.SafetyTypeId == dto.SafteyTypeId && relation.CitizenId == null)
+            .WhereIF(dto.SafetyTypeId.NotNullOrEmpty(), (citizen, third, relation) => relation.SafetyTypeId == dto.SafetyTypeId && relation.CitizenId == null)
             .Select((citizen, third, relation) => new GetThirdCitizenOutDto { CitizenId = citizen.Id}, true);
 #if DEBUG
         var sql = query.ToSqlString();

+ 1 - 1
src/Hotline.Share/Dtos/Snapshot/SnapshotUserInfoDto.cs

@@ -140,7 +140,7 @@ public record GetThirdCitizenInDto : PagedRequest
     /// <summary>
     /// 志愿者类型Id
     /// </summary>
-    public string? SafteyTypeId { get; set; }
+    public string? SafetyTypeId { get; set; }
 
     /// <summary>
     /// 电话号码