|
@@ -108,7 +108,6 @@ public class GameTeamServiceImpl implements IGameTeamService {
|
|
|
LambdaQueryWrapper<GameTeam> lqw = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<GameTeam> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.orderByAsc(GameTeam::getTeamId);
|
|
lqw.orderByAsc(GameTeam::getTeamId);
|
|
|
lqw.eq(bo.getEventId() != null, GameTeam::getEventId, bo.getEventId());
|
|
lqw.eq(bo.getEventId() != null, GameTeam::getEventId, bo.getEventId());
|
|
|
-
|
|
|
|
|
Optional.ofNullable(bo.getEventName())
|
|
Optional.ofNullable(bo.getEventName())
|
|
|
.filter(StringUtils::isNotBlank)
|
|
.filter(StringUtils::isNotBlank)
|
|
|
.ifPresent(eventName -> {
|
|
.ifPresent(eventName -> {
|
|
@@ -125,7 +124,6 @@ public class GameTeamServiceImpl implements IGameTeamService {
|
|
|
lqw.apply("1=0");
|
|
lqw.apply("1=0");
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getTeamName()), GameTeam::getTeamName, bo.getTeamName());
|
|
lqw.like(StringUtils.isNotBlank(bo.getTeamName()), GameTeam::getTeamName, bo.getTeamName());
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getTeamCode()), GameTeam::getTeamCode, bo.getTeamCode());
|
|
lqw.like(StringUtils.isNotBlank(bo.getTeamCode()), GameTeam::getTeamCode, bo.getTeamCode());
|
|
|
lqw.and(bo.getRgId() != null,
|
|
lqw.and(bo.getRgId() != null,
|
|
@@ -143,6 +141,7 @@ public class GameTeamServiceImpl implements IGameTeamService {
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getNumberRange()), GameTeam::getNumberRange, bo.getNumberRange());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getNumberRange()), GameTeam::getNumberRange, bo.getNumberRange());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getTeamDescribe()), GameTeam::getTeamDescribe, bo.getTeamDescribe());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getTeamDescribe()), GameTeam::getTeamDescribe, bo.getTeamDescribe());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), GameTeam::getStatus, bo.getStatus());
|
|
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), GameTeam::getStatus, bo.getStatus());
|
|
|
|
|
+ lqw.eq(GameTeam::getDelFlag, "0");
|
|
|
return lqw;
|
|
return lqw;
|
|
|
}
|
|
}
|
|
|
|
|
|