|
|
@@ -215,14 +215,14 @@ public class HandHistoryServiceImpl implements IHandHistoryService {
|
|
|
public List<HandHistoryVo> selectAllHandZhuoCi(HandHistoryBo bo) {
|
|
|
String playerUserId=bo.getPlayerNameOrId();
|
|
|
if(StringUtils.isBlank(bo.getPlayerNameOrId())){
|
|
|
- if(bo.getPlayerId()!=null){
|
|
|
- playerUserId=bo.getPlayerId().toString();
|
|
|
+ if(bo.getPlayerId()!=null && StringUtils.isNotBlank(bo.getPlayerId())){
|
|
|
+ playerUserId=bo.getPlayerId();
|
|
|
}
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(playerUserId)){
|
|
|
UserVo userVo = userMapper.selUserInfo(playerUserId);
|
|
|
if(userVo!=null){
|
|
|
- return baseMapper.selectAllHandZhuoCi(bo.getTournamentId(),userVo.getId());
|
|
|
+ return baseMapper.selectAllHandZhuoCi(bo.getTournamentId(),userVo.getId().toString());
|
|
|
}else{
|
|
|
return new ArrayList<>();
|
|
|
}
|