|
|
@@ -1347,19 +1347,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
@Override
|
|
|
public SalesmanVo getUserInfoBySystemCodeAndUserId(String userId) {
|
|
|
SalesmanVo salesmanVo = sysUserJzgInfoMapper.getUserInfoBySystemCodeAndUserId(userId);
|
|
|
- String leaderId = salesmanVo.getLeaderId();
|
|
|
- if(StrUtil.isEmpty(leaderId)){
|
|
|
- return salesmanVo;
|
|
|
- }
|
|
|
- SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectById(leaderId);
|
|
|
- if(sysUserJzgInfo == null){
|
|
|
- return salesmanVo;
|
|
|
- }
|
|
|
- String leaderUserId = sysUserJzgInfo.getUserId();
|
|
|
- salesmanVo.setRealQuoteUserManagerId(leaderUserId);
|
|
|
- SysUser sysUser = sysUserMapper.selectById(leaderUserId);
|
|
|
- if(sysUser != null){
|
|
|
- salesmanVo.setRealQuoteUserManagerUseName(sysUser.getUsername());
|
|
|
+ if(Objects.nonNull(salesmanVo)){
|
|
|
+ String leaderId = salesmanVo.getLeaderId();
|
|
|
+ if(StrUtil.isEmpty(leaderId)){
|
|
|
+ return salesmanVo;
|
|
|
+ }
|
|
|
+ SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectById(leaderId);
|
|
|
+ if(sysUserJzgInfo == null){
|
|
|
+ return salesmanVo;
|
|
|
+ }
|
|
|
+ String leaderUserId = sysUserJzgInfo.getUserId();
|
|
|
+ salesmanVo.setRealQuoteUserManagerId(leaderUserId);
|
|
|
+ SysUser sysUser = sysUserMapper.selectById(leaderUserId);
|
|
|
+ if(sysUser != null){
|
|
|
+ salesmanVo.setRealQuoteUserManagerUseName(sysUser.getUsername());
|
|
|
+ }
|
|
|
}
|
|
|
return salesmanVo;
|
|
|
}
|