人员字典标签修改密码

performance/Performance.Services/PersonService.cs

@@ -984,7 +984,7 @@ public ApiResponse BathSavePerson(int allotId, int HospitalId, SaveCollectData r
                 var backupTab = perforPeremployeeBackupRepository.GetEntities(t => t.AllotId == allotId);
                 employees.ForEach(e =>
                 {
-                    var result = backupTab.FirstOrDefault(d => d.PersonnelNumber.Replace(" ","") == e.PersonnelNumber.Replace(" ", "") && d.AllotId == e.AllotId && d.HospitalId == e.HospitalId);
+                    var result = backupTab.FirstOrDefault(d => d.PersonnelNumber.Replace(" ", "") == e.PersonnelNumber.Replace(" ", "") && d.AllotId == e.AllotId && d.HospitalId == e.HospitalId);
                     if (result != null)
                     {
                         e.JobNumber = result.JobNumber;
@@ -1317,6 +1317,7 @@ public void SaveQueryRole(int hospitalId, int userId, List<Dictionary<string, st
             var users = perforUserRepository.GetEntities(t => userRole.Contains(t.ID));
 
             var newUsers = new List<string[]>();
+            var updateUsers = new List<sys_user>();
             foreach (var item in dicData)
             {
                 var json = JsonHelper.Serialize(item);
@@ -1324,13 +1325,22 @@ public void SaveQueryRole(int hospitalId, int userId, List<Dictionary<string, st
                 if (hospital.IsOwnerQuery == 1)
                 {
                     var isNewRole = !string.IsNullOrEmpty(data.PersonnelNumber?.Trim()) && !string.IsNullOrEmpty(item["Password"]);
-                    var isRepeat = users != null && users.Any(t => t.Login == data.PersonnelNumber?.Trim());
-                    if (isNewRole && !isRepeat)
+                    var isRepeat = users.FirstOrDefault(t => t.Login == data.PersonnelNumber?.Trim());
+                    if (isRepeat != null)
+                    {
+                        isRepeat.Password = item["Password"];
+                        updateUsers.Add(isRepeat);
+                    }
+                    if (isNewRole && isRepeat == null)
                     {
                         newUsers.Add(new[] { $"{data.DoctorName?.Trim()}", $"{data.PersonnelNumber?.Trim()}", $"{item["Password"]}", "", "", "绩效查询", $"{hospital.HosName}", $"{data.AccountingUnit?.Trim()}" });
                     }
                 }
             }
+            if (updateUsers.Count > 0)
+            {
+                perforUserRepository.UpdateRange(updateUsers.ToArray());
+            }
             if (newUsers.Count > 0)
             {
                 usercollor.Data = newUsers.ToArray();