Commit 1285c225 authored by 赵啸非's avatar 赵啸非

修改设备管理 外部登录

parent d2f8430f
...@@ -135,9 +135,12 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor ...@@ -135,9 +135,12 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
public String index(HttpServletRequest request, HttpServletResponse response) throws Exception { public String index(HttpServletRequest request, HttpServletResponse response) throws Exception {
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
IUser user = this.getCurUser(); IUser user = this.getCurUser();
if (user == null) {
user = super.getCurUser();
if (user == null) { if (user == null) {
return ""; return "";
} }
}
Set<String> urls = resourceService.findUrlSetByUserId(user.getId()); Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls); List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
String currUserName = user.getRealName(); String currUserName = user.getRealName();
......
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