人员、科室数据保存，null值检验；数据录入，多角色添加配置

performance/Performance.Services/CollectService.cs

@@ -184,21 +184,28 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
             }
 
             // 新增
+            var users = new List<sys_user> { user };
+            var children = userRepository.GetEntities(w => w.ParentID == userid);
+            if (children != null && children.Any()) users.AddRange(children);
+
             var data2 = collects.Where(w => !w.PermissionId.HasValue && (w.Visible > 0 || w.AttachLast > 0 || w.Readnoly > 0));
-            var inserts = data2?.Select(w => new collect_permission
-            {
-                UserId = userid,
-                SheetName = w.SheetName,
-                SheetType = w.SheetType,
-                HospitalId = w.HospitalId,
-                HeadName = w.HeadName,
-                AttachLast = w.AttachLast,
-                Readnoly = w.Readnoly,
-                Visible = w.Visible,
-            });
-            if (data2 != null)
+            foreach (var item in users)
             {
-                perforcollectpermissionRepository.AddRange(inserts.ToArray());
+                var inserts = data2?.Select(w => new collect_permission
+                {
+                    UserId = item.ID,
+                    SheetName = w.SheetName,
+                    SheetType = w.SheetType,
+                    HospitalId = w.HospitalId,
+                    HeadName = w.HeadName,
+                    AttachLast = w.AttachLast,
+                    Readnoly = w.Readnoly,
+                    Visible = w.Visible,
+                });
+                if (data2 != null)
+                {
+                    perforcollectpermissionRepository.AddRange(inserts.ToArray());
+                }
             }
         }
 

performance/Performance.Services/PersonService.cs

@@ -720,7 +720,7 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
             var dicData = CreateDataRow(request, dict);
             List<per_employee> employees = new List<per_employee>();
             var persons = peremployeeRepository.GetEntities(t => t.HospitalId == HospitalId && t.AllotId == AllotId);
-            var delPersonsNum =new List<string>();
+            var delPersonsNum = new List<string>();
             foreach (var item in dicData)
             {
                 if (!string.IsNullOrEmpty(item["AttendanceDay"]) && !string.IsNullOrEmpty(item["ReservedRatio"]))
@@ -748,9 +748,10 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
                     employees.Add(data);
                 }
             }
-            var delPerson = persons.Where(t => delPersonsNum.Contains(t.PersonnelNumber)).ToArray();
-            peremployeeRepository.RemoveRange(delPerson);
-            if (employees.Any())
+            var delPerson = persons?.Where(t => delPersonsNum.Contains(t.PersonnelNumber));
+            if (delPerson != null && delPerson.Any())
+                peremployeeRepository.RemoveRange(delPerson.ToArray());
+            if (employees != null && employees.Any())
                 peremployeeRepository.AddRange(employees.ToArray());
 
             return true;
@@ -760,7 +761,7 @@ public void SaveDeptDicHands(int HospitalId, SaveCollectData request)
         {
             var dicData = CreateDataRow(request, DeptDic);
             var deptDic = perdeptdicRepository.GetEntities(t => t.HospitalId == HospitalId);
-            var depts =deptDic?.Select(w => new { w.Department, w.HISDeptName }).Distinct();
+            var depts = deptDic?.Select(w => new { w.Department, w.HISDeptName }).Distinct();
             List<per_dept_dic> deptDics = new List<per_dept_dic>();
             var delDepartment = new List<string>();
             foreach (var dic in dicData)
@@ -778,9 +779,10 @@ public void SaveDeptDicHands(int HospitalId, SaveCollectData request)
                 }
 
             }
-            var delDept = deptDic.Where(t => delDepartment.Contains(t.HISDeptName)).ToArray();
-            perdeptdicRepository.RemoveRange(delDept);
-            if (deptDics.Any())
+            var delDept = deptDic?.Where(t => delDepartment.Contains(t.HISDeptName));
+            if (delDept != null && delDept.Any())
+                perdeptdicRepository.RemoveRange(delDept.ToArray());
+            if (deptDics != null && deptDics.Any())
                 perdeptdicRepository.AddRange(deptDics.ToArray());
         }