Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
1498ff33
Commit
1498ff33
authored
Sep 23, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资相关权限-优化
parent
ab89c716
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
Common.java
.../com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java
+2
-2
MenuUtil.java
...om/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
+4
-2
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/Common.java
View file @
1498ff33
...
...
@@ -63,7 +63,7 @@ public class Common {
}
public
static
boolean
isNotNull
(
Object
obj
)
{
return
null
!=
obj
&&
!
""
.
equals
(
obj
);
return
null
!=
obj
&&
!
""
.
equals
(
obj
)
&&
!
"null"
.
equals
(
obj
)
;
}
public
static
boolean
isNotEmpty
(
List
obj
)
{
...
...
@@ -71,7 +71,7 @@ public class Common {
}
public
static
boolean
isNotNull
(
String
obj
)
{
if
(
null
!=
obj
&&
!
""
.
equals
(
obj
)
&&
!
"undefined"
.
equals
(
obj
))
{
if
(
null
!=
obj
&&
!
""
.
equals
(
obj
)
&&
!
"undefined"
.
equals
(
obj
)
&&
!
"null"
.
equals
(
obj
)
)
{
return
true
;
}
return
false
;
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
View file @
1498ff33
...
...
@@ -78,7 +78,7 @@ public class MenuUtil {
}
if
(
Common
.
isNotNull
(
obj
))
{
SimpleValueWrapper
objs
=
(
SimpleValueWrapper
)
obj
;
if
(
Common
.
is
Empty
(
objs
))
{
if
(
Common
.
is
NotNull
(
objs
))
{
String
sql
=
String
.
valueOf
(
objs
.
get
());
if
(
sql
.
contains
(
"#create_by"
))
{
sql
=
sql
.
replace
(
"#create_by"
,
user
.
getId
());
...
...
@@ -121,7 +121,9 @@ public class MenuUtil {
sql
=
sql
.
replace
(
"#deptId"
,
userIds
);
//sql = sql.replace(" or dept.dept_id = #deptId ", "")
}
entity
.
setAuthSql
(
sql
);
if
(
Common
.
isNotNull
(
sql
))
{
entity
.
setAuthSql
(
sql
);
}
}
}
}
...
...
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