pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -229,7 +229,7 @@ @GetMapping(path = "loginUserId") public Long loginUserId(String token){ BaUser userPo = this.sv.getByUuid(token) ; return userPo == null ? null : userPo.userId ; return userPo == null ? null : userPo.id ; } /** * 此方法供子模块系统调用，所以不公开在API接口中 @@ -306,7 +306,7 @@ BaUser userPo = this.sv.getByUuid(token) ; CurUserVo vo = new CurUserVo(); if(userPo != null){ vo.id = userPo.userId ; vo.id = userPo.id ; vo.name = userPo.userName; } return vo ; pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
@@ -41,8 +41,8 @@ @Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true) public BaUser loginWithMapperXml(String uuid, String phone, String password){ BaUser baUser = this.baUserMapper.login(phone, password) ; if(baUser != null && baUser.userId != null){ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ; if(baUser != null && baUser.id != null){ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ; } return baUser; } @@ -66,8 +66,8 @@ .eq("phone", phone) .eq("password", password); BaUser baUser = this.baUserMapper.selectOne(qw) ; if(baUser != null && baUser.userId != null){ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ; if(baUser != null && baUser.id != null){ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ; } return baUser; } pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVoMapper.java
@@ -15,7 +15,7 @@ * @param po * @return */ @Mapping(target = "id", source = "userId") @Mapping(target = "id", source = "id") @Mapping(target = "name", source = "userName") @Mapping(target = "phone", source = "phone") @Mapping(target = "token", ignore=true)
