Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
aff54ab5
Commit
aff54ab5
authored
Jul 26, 2022
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自定义数据权限不排除重复
parent
06177add
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
...main/java/com/ruoyi/common/exception/GlobalException.java
+0
-1
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
...ain/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+1
-1
No files found.
ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
View file @
aff54ab5
...
...
@@ -7,7 +7,6 @@ package com.ruoyi.common.exception;
*/
public
class
GlobalException
extends
RuntimeException
{
private
static
final
long
serialVersionUID
=
1L
;
/**
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
View file @
aff54ab5
...
...
@@ -92,7 +92,7 @@ public class DataScopeAspect
for
(
SysRole
role
:
user
.
getRoles
())
{
String
dataScope
=
role
.
getDataScope
();
if
(
conditions
.
contains
(
dataScope
))
if
(
!
DATA_SCOPE_CUSTOM
.
equals
(
dataScope
)
&&
conditions
.
contains
(
dataScope
))
{
continue
;
}
...
...
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