Commit 828a0f89 authored by 赵啸非's avatar 赵啸非

添加更新默认用户角色

parent 8fbfcda5
...@@ -12,7 +12,6 @@ import com.mortals.xhx.base.system.resource.service.ResourceService; ...@@ -12,7 +12,6 @@ import com.mortals.xhx.base.system.resource.service.ResourceService;
import com.mortals.xhx.base.system.user.model.UserEntity; import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.key.RedisKey; import com.mortals.xhx.common.key.RedisKey;
import com.mortals.xhx.common.pdu.user.LoginPdu;
import com.mortals.xhx.common.pdu.user.UserPdu; import com.mortals.xhx.common.pdu.user.UserPdu;
import com.mortals.xhx.common.utils.MenuEncodeUtil; import com.mortals.xhx.common.utils.MenuEncodeUtil;
import com.mortals.xhx.feign.user.IUserFeign; import com.mortals.xhx.feign.user.IUserFeign;
...@@ -70,7 +69,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -70,7 +69,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
log.info("userId:{},urls:{}", user.getId(), JSON.toJSONString(urls)); log.info("userId:{},urls:{}", user.getId(), JSON.toJSONString(urls));
// List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls); // List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
List<MenuEntity> treeMenuList = menuService.findTreeMenu(user); List<MenuEntity> treeMenuList = menuService.findTreeMenu(user,urls);
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