Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhi...

xiang

2023-09-14 66e4211cbfa154a87390b25c93b32d722e0d690c

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -900,8 +900,10 @@

        SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
                .lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
        loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId().toString());

        if(sysUserRoleDO!=null )
        {
            loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId()+"");
        }
        return R.ok(loginUserInfoVO);
    }