基本信息

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -162,16 +162,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        Map<String, Object> userinfo = new HashedMap();
        UserDO user = userDao.findOne(id);
        RoleDO role = roleDao.findByCode(user.getRoleCode());
        RoleDO role = null;
        userinfo.put("id", user.getId());
        userinfo.put("name", user.getName());
        userinfo.put("role", role.getName());
        userinfo.put("roleCode", role.getCode());
        userinfo.put("system", role.getSystem());
        if (user != null) {
            userinfo.put("id", user.getId());
            userinfo.put("name", user.getName());
            if(org.apache.commons.lang3.StringUtils.isNotBlank(user.getRoleCode())){
                role = roleDao.findOne(user.getRoleCode());
            }
        }
        //获取角色