BUG修复

parent 23155235
...@@ -55,7 +55,7 @@ private void InitColHeaders(int sheetType, string[] cols) ...@@ -55,7 +55,7 @@ private void InitColHeaders(int sheetType, string[] cols)
{ {
if (!necessitys.Contains(item)) if (!necessitys.Contains(item))
necessitys.Add(item); necessitys.Add(item);
if (!_permissions.Any(w => w.HeadName == item && w.Visible == 0)) if (!_permissions.Any(w => w.HeadName == item && w.Visible == 1))
necessitys.Remove(item); necessitys.Remove(item);
} }
ColHeaders = necessitys.ToArray(); ColHeaders = necessitys.ToArray();
......
...@@ -129,7 +129,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects) ...@@ -129,7 +129,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
if (user == null) if (user == null)
throw new PerformanceException("参数无效"); throw new PerformanceException("参数无效");
// 删除 // 删除
var data3 = collects.Where(w => w.PermissionId.HasValue && 0 == w.AttachLast && 0 == w.Readnoly); var data3 = collects.Where(w => w.PermissionId.HasValue && 0 == w.Visible && 0 == w.AttachLast && 0 == w.Readnoly);
if (data3 != null) if (data3 != null)
{ {
var ids = data3.Select(t => t.PermissionId).ToList(); var ids = data3.Select(t => t.PermissionId).ToList();
...@@ -139,7 +139,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects) ...@@ -139,7 +139,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
} }
// 修改 // 修改
var data1 = collects.Where(w => w.PermissionId.HasValue && (w.AttachLast > 0 || w.Readnoly > 0)); var data1 = collects.Where(w => w.PermissionId.HasValue && (w.Visible > 0 || w.AttachLast > 0 || w.Readnoly > 0));
if (data1 != null) if (data1 != null)
{ {
var ids = data1.Select(t => t.PermissionId).ToList(); var ids = data1.Select(t => t.PermissionId).ToList();
...@@ -157,7 +157,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects) ...@@ -157,7 +157,7 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
} }
// 新增 // 新增
var data2 = collects.Where(w => !w.PermissionId.HasValue && (w.AttachLast > 0 || w.Readnoly > 0)); 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 var inserts = data2?.Select(w => new collect_permission
{ {
UserId = userid, UserId = userid,
...@@ -170,7 +170,9 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects) ...@@ -170,7 +170,9 @@ public void SetPermission(int userid, IEnumerable<CollectPermission> collects)
Visible = w.Visible, Visible = w.Visible,
}); });
if (data2 != null) if (data2 != null)
{
perforcollectpermissionRepository.AddRange(inserts.ToArray()); perforcollectpermissionRepository.AddRange(inserts.ToArray());
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment