数据录入设置权限

performance/Performance.Services/CollectService.cs

@@ -176,32 +176,41 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
             var user = userRepository.GetEntity(w => w.ID == userid);
             if (user == null)
                 throw new PerformanceException("参数无效");
-            // 删除
-            var data3 = collects.Where(w => w.PermissionId.HasValue && 0 == w.Visible && 0 == w.AttachLast && 0 == w.Readnoly);
-            if (data3 != null)
-            {
-                var ids = data3.Select(t => t.PermissionId).ToList();
-                var deletes = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
-                if (deletes != null)
-                    perforcollectpermissionRepository.RemoveRange(deletes.ToArray());
-            }
 
-            // 修改
-            var data1 = collects.Where(w => w.PermissionId.HasValue && (w.Visible > 0 || w.AttachLast > 0 || w.Readnoly > 0));
-            if (data1 != null)
+            //// 删除
+            //var data3 = collects.Where(w => w.PermissionId.HasValue && 0 == w.Visible && 0 == w.AttachLast && 0 == w.Readnoly);
+            //if (data3 != null)
+            //{
+            //    var ids = data3.Select(t => t.PermissionId).ToList();
+            //    var deletes = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
+            //    if (deletes != null)
+            //        perforcollectpermissionRepository.RemoveRange(deletes.ToArray());
+            //}
+
+            //// 修改
+            //var data1 = collects.Where(w => w.PermissionId.HasValue && (w.Visible > 0 || w.AttachLast > 0 || w.Readnoly > 0));
+            //if (data1 != null)
+            //{
+            //    var ids = data1.Select(t => t.PermissionId).ToList();
+            //    var updates = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
+            //    if (updates != null)
+            //    {
+            //        foreach (var item in updates)
+            //        {
+            //            item.AttachLast = data1.FirstOrDefault(w => w.PermissionId == item.Id).AttachLast;
+            //            item.Readnoly = data1.FirstOrDefault(w => w.PermissionId == item.Id).Readnoly;
+            //            item.Visible = data1.FirstOrDefault(w => w.PermissionId == item.Id).Visible;
+            //        }
+            //        perforcollectpermissionRepository.UpdateRange(updates.ToArray());
+            //    }
+            //}
+
+            var hospitalid = collects?.FirstOrDefault(w => w.HospitalId > 0)?.HospitalId;
+            if (hospitalid.HasValue)
             {
-                var ids = data1.Select(t => t.PermissionId).ToList();
-                var updates = perforcollectpermissionRepository.GetEntities(w => ids.Contains(w.Id));
-                if (updates != null)
-                {
-                    foreach (var item in updates)
-                    {
-                        item.AttachLast = data1.FirstOrDefault(w => w.PermissionId == item.Id).AttachLast;
-                        item.Readnoly = data1.FirstOrDefault(w => w.PermissionId == item.Id).Readnoly;
-                        item.Visible = data1.FirstOrDefault(w => w.PermissionId == item.Id).Visible;
-                    }
-                    perforcollectpermissionRepository.UpdateRange(updates.ToArray());
-                }
+                var permissions = perforcollectpermissionRepository.GetEntities(t => t.HospitalId == hospitalid.Value && t.UserId == userid);
+                if (permissions != null && permissions.Any())
+                    perforcollectpermissionRepository.RemoveRange(permissions.ToArray());
             }
 
             // 新增
@@ -209,7 +218,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
             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 data2 = collects.Where(w => w.Visible > 0);
             foreach (var item in users)
             {
                 var inserts = data2?.Select(w => new collect_permission
@@ -237,7 +246,11 @@ public IEnumerable<collect_permission> GetCollectSheet(int hospitalId, int userI
 
             if (!options.CollectRoles.Contains(userrole.RoleID))
             {
-                Expression<Func<collect_permission, bool>> exp = (w) => w.HospitalId == hospitalId && w.UserId == userId;
+                var types = new[] { (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload, (int)SheetType.SpecialUnit };
+                var sheetNames = exmoduleRepository.GetEntities(w => w.HospitalId == hospitalId && types.Contains(w.SheetType ?? 0))?.Select(t => t.ModuleName).ToList() ?? new List<string>();
+                sheetNames.Add("4.2 特殊核算单元绩效测算表");
+
+                Expression<Func<collect_permission, bool>> exp = (w) => w.HospitalId == hospitalId && w.UserId == userId && sheetNames.Contains(w.SheetName);
                 if (!string.IsNullOrEmpty(sheetName))
                     exp = exp.And(w => w.SheetName == sheetName);
                 return perforcollectpermissionRepository.GetEntities(exp);