Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
4a5e45d1
Commit
4a5e45d1
authored
Dec 04, 2025
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化数据权限控制逻辑,放开permission限制
parent
188e50ff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
DataScopeAspect.java
...ain/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+2
-2
LogAspect.java
.../src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+2
-2
No files found.
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
View file @
4a5e45d1
...
...
@@ -94,7 +94,7 @@ public class DataScopeAspect
List
<
String
>
conditions
=
new
ArrayList
<
String
>();
List
<
String
>
scopeCustomIds
=
new
ArrayList
<
String
>();
user
.
getRoles
().
forEach
(
role
->
{
if
(
DATA_SCOPE_CUSTOM
.
equals
(
role
.
getDataScope
())
&&
StringUtils
.
equals
(
role
.
getStatus
(),
UserConstants
.
ROLE_NORMAL
)
&&
StringUtils
.
containsAny
(
role
.
getPermissions
(),
Convert
.
toStrArray
(
permission
)))
if
(
DATA_SCOPE_CUSTOM
.
equals
(
role
.
getDataScope
())
&&
StringUtils
.
equals
(
role
.
getStatus
(),
UserConstants
.
ROLE_NORMAL
)
&&
(
StringUtils
.
isEmpty
(
permission
)
||
StringUtils
.
containsAny
(
role
.
getPermissions
(),
Convert
.
toStrArray
(
permission
)
)))
{
scopeCustomIds
.
add
(
Convert
.
toStr
(
role
.
getRoleId
()));
}
...
...
@@ -107,7 +107,7 @@ public class DataScopeAspect
{
continue
;
}
if
(!
StringUtils
.
containsAny
(
role
.
getPermissions
(),
Convert
.
toStrArray
(
permission
)))
if
(
StringUtils
.
isNotEmpty
(
permission
)
&&
!
StringUtils
.
containsAny
(
role
.
getPermissions
(),
Convert
.
toStrArray
(
permission
)))
{
continue
;
}
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View file @
4a5e45d1
...
...
@@ -112,7 +112,7 @@ public class LogAspect
if
(
e
!=
null
)
{
operLog
.
setStatus
(
BusinessStatus
.
FAIL
.
ordinal
());
operLog
.
setErrorMsg
(
StringUtils
.
substring
(
Convert
.
toStr
(
e
.
getMessage
(),
ExceptionUtil
.
getExceptionMessage
(
e
)),
0
,
PARAM_MAX_LENGTH
));
operLog
.
setErrorMsg
(
StringUtils
.
substring
(
Convert
.
toStr
(
e
.
getMessage
(),
ExceptionUtil
.
getExceptionMessage
(
e
)),
0
,
2000
));
}
// 设置方法名称
String
className
=
joinPoint
.
getTarget
().
getClass
().
getName
();
...
...
@@ -163,7 +163,7 @@ public class LogAspect
// 是否需要保存response,参数和值
if
(
log
.
isSaveResponseData
()
&&
StringUtils
.
isNotNull
(
jsonResult
))
{
operLog
.
setJsonResult
(
StringUtils
.
substring
(
JSON
.
toJSONString
(
jsonResult
),
0
,
PARAM_MAX_LENGTH
));
operLog
.
setJsonResult
(
StringUtils
.
substring
(
JSON
.
toJSONString
(
jsonResult
),
0
,
2000
));
}
}
...
...
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