Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
487cd7d7
Commit
487cd7d7
authored
Sep 01, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG修复
parent
23155235
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
performance/Performance.DtoModels/HandsonTable.cs
+1
-1
performance/Performance.Services/CollectService.cs
+5
-3
No files found.
performance/Performance.DtoModels/HandsonTable.cs
View file @
487cd7d7
...
@@ -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
();
...
...
performance/Performance.Services/CollectService.cs
View file @
487cd7d7
...
@@ -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
());
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment