Skip to content

D
device-platform
Commit 894a4442 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改设备管理

parent 8a7dfd77
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
device-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @ 894a4442
...@@ -141,6 +141,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor ...@@ -141,6 +141,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
log.info("user is null:{}",user==null); log.info("user is null:{}",user==null);
if (user == null) { if (user == null) {
return ""; return "";
// user = super.getCurUser(); // user = super.getCurUser();
// if (user == null) { // if (user == null) {
...@@ -148,7 +149,9 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor ...@@ -148,7 +149,9 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
// } // }
} }
Set<String> urls = resourceService.findUrlSetByUserId(user.getId()); Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
log.info("urls:{}",JSON.toJSONString(urls));
List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls); List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
log.info("outlookBarList:{}",JSON.toJSONString(outlookBarList));
String currUserName = user.getRealName(); String currUserName = user.getRealName();
if (currUserName == null || currUserName.trim().length() == 0) { if (currUserName == null || currUserName.trim().length() == 0) {
currUserName = "管理员"; currUserName = "管理员";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment