Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
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
赵啸非
device-new-platform
Commits
481b18b9
Commit
481b18b9
authored
Jul 06, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
短信界面修改
parent
c38f8a1c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
device-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java
...ls/xhx/base/system/menu/service/impl/MenuServiceImpl.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
...va/com/mortals/xhx/base/system/user/model/UserEntity.java
+3
-2
No files found.
device-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java
View file @
481b18b9
...
@@ -52,7 +52,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
...
@@ -52,7 +52,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
@Override
@Override
public
List
<
MenuEntity
>
findTreeMenu
(
IUser
user
,
Set
<
String
>
urls
)
throws
AppException
{
public
List
<
MenuEntity
>
findTreeMenu
(
IUser
user
,
Set
<
String
>
urls
)
throws
AppException
{
Set
<
Long
>
authIds
=
new
HashSet
<
Long
>();
Set
<
Long
>
authIds
=
new
HashSet
<>();
Map
<
Long
,
MenuEntity
>
menuMap
=
new
HashMap
<
Long
,
MenuEntity
>();
Map
<
Long
,
MenuEntity
>
menuMap
=
new
HashMap
<
Long
,
MenuEntity
>();
List
<
MenuEntity
>
userModuleList
=
this
.
findAllEnable
();
List
<
MenuEntity
>
userModuleList
=
this
.
findAllEnable
();
for
(
MenuEntity
sysModule
:
userModuleList
)
{
for
(
MenuEntity
sysModule
:
userModuleList
)
{
...
...
device-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @
481b18b9
package
com.mortals.xhx.base.system.user.model
;
package
com.mortals.xhx.base.system.user.model
;
import
com.mortals.framework.ap.SysConstains
;
import
com.mortals.framework.service.IUser
;
import
com.mortals.framework.service.IUser
;
import
com.mortals.xhx.base.system.user.model.vo.UserVo
;
import
com.mortals.xhx.base.system.user.model.vo.UserVo
;
...
@@ -130,12 +131,12 @@ public class UserEntity extends UserVo implements IUser {
...
@@ -130,12 +131,12 @@ public class UserEntity extends UserVo implements IUser {
@Override
@Override
public
boolean
isAdmin
()
{
public
boolean
isAdmin
()
{
return
false
;
return
super
.
getId
()
==
null
?
false
:
super
.
getId
().
longValue
()
==
SysConstains
.
ADMIN_ID
;
}
}
@Override
@Override
public
boolean
isSystemUser
()
{
public
boolean
isSystemUser
()
{
return
false
;
return
userType
!=
null
&&
userType
.
intValue
()
==
0
;
}
}
@Override
@Override
...
...
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