Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5388,15 +5388,21 @@ FROM
                                                       .LeftJoin<Crm_DeleClient>((tcl, dc) => tcl.ClientId == dc.Id && dc.IsDel == 0)
                                                       .LeftJoin<Crm_CustomerCompany>((tcl, dc, cc) => dc.CrmCompanyId == cc.Id && dc.IsDel == 0)
                                                       .Where((tcl, dc, cc) => tcl.IsDel == 0 && tcl.DiId == dto.DiId)
-                                                      .Select((tcl, dc, cc) => new
+                                                      .Select((tcl, dc, cc) => new ClientInfo
                                                       {
-                                                          Name = dc.LastName + dc.FirstName,
+                                                          LastName = dc.LastName,
+                                                          FirstName = dc.FirstName,
                                                           Sex = dc.Sex,
                                                           Birthday = dc.BirthDay,
                                                           Company = cc.CompanyFullName,
                                                           Job = dc.Job
                                                       })
                                                       .ToList();
+                foreach (var item in DeleClientList)
+                {
+                    EncryptionProcessor.DecryptProperties(item);
+                }
+
                 var blackCode = _sqlSugar.Queryable<Air_TicketBlackCode>().Where(it => it.IsDel == 0 && it.DiId == dto.DiId).First();
                 var threeCodes = _sqlSugar.Queryable<Res_ThreeCode>().Where(it => it.IsDel == 0).ToList();
                 var placeData = _sqlSugar.Queryable<Grp_NationalTravelFee>().Where(it => it.IsDel == 0).ToList();

OASystem/OASystem.Domain/Dtos/Groups/TourClientListDto.cs

@@ -351,4 +351,21 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int Language { get; set; } = 0;
     }
+
+    public class ClientInfo
+    {
+        [Encrypted]
+        public string LastName { get; set; }
+        [Encrypted]
+        public string FirstName { get; set; }
+        public string Name { get{
+                return this.LastName + this.FirstName ;
+            } }
+        public int Sex { get; set; }
+        public DateTime ?Birthday { get; set; }
+        [Encrypted]
+        public string Company { get; set; }
+        [Encrypted]
+        public string Job { get; set; }
+    }
 }