自定义字段修改BUG修复

performance/Performance.DtoModels/Request/ComputerRequest.cs

@@ -62,6 +62,7 @@ public class ComputerAliasUpdate
     }
     public class ComputerAliasHead
     {
+        public string Name { get; set; }
         public string Head { get; set; }
         public int HeadId { get; set; }
         public int Sort { get; set; }

performance/Performance.Services/ComputeConfig.cs

@@ -161,8 +161,6 @@ public static List<cof_alias> GetAllPersonnelTags(bool ownerQuery)
                 new cof_alias{ Alias = "预留比例", Name = nameof(per_employee.ReservedRatio), States = 1, SumStatus = 0, Sort = 16 },
                 new cof_alias{ Alias = "银行卡号", Name = nameof(per_employee.BankCard), States = 1, SumStatus = 0, Sort = 18 },
 
-                new cof_alias{ Alias = "银行卡号", Name = nameof(per_employee.BankCard), States = 1, SumStatus = 0, Sort = 99 },
-
                 new cof_alias{ Alias = "备用01", Name = nameof(per_employee.Reserve01), States = 0, SumStatus = 0, Sort = 20 },
                 new cof_alias{ Alias = "备用02", Name = nameof(per_employee.Reserve02), States = 0, SumStatus = 0, Sort = 20 },
                 new cof_alias{ Alias = "备用03", Name = nameof(per_employee.Reserve03), States = 0, SumStatus = 0, Sort = 20 },
@@ -183,7 +181,7 @@ public static List<cof_alias> GetAllPersonnelTags(bool ownerQuery)
             if (ownerQuery)
                 alias.Add(new cof_alias { Alias = "密码", Name = "Password", States = 1, SumStatus = 0, Sort = 7 });
 
-            return alias.Where(w => w.States == 1).OrderBy(w => w.Sort).ToList();
+            return alias.OrderBy(w => w.Sort).ToList();
         }
     }
 }

performance/Performance.Services/ComputeService.cs

@@ -2024,13 +2024,15 @@ public bool UpdateHeadersStatus(ComputerAliasUpdate request)
                 var data = heads.Select(t => new cof_alias
                 {
                     Route = request.Route,
-                    Alias = t.Alias,
+                    Alias = request.computerAliasHead.FirstOrDefault(w => w.Name == t.Name)?.Head ?? t.Alias,
                     OriginalName = t.Alias,
                     HospitalId = request.HospitalId,
                     Name = t.Name,
                     States = items.Contains(t.Alias ?? "") ? 1 : 0,
                     SumStatus = t.SumStatus,
-                    Sort = request.computerAliasHead.FirstOrDefault(w => w.Head == t.Alias).Sort
+                    Sort = request.computerAliasHead.Any(w => w.Name == t.Name)
+                        ? request.computerAliasHead.FirstOrDefault(w => w.Name == t.Name).Sort
+                        : t.Sort
                 });
                 cofaliasRepository.AddRange(data.ToArray());
             }