|
@@ -1516,10 +1516,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
if (CollectionUtils.isNotEmpty(dto.getGameId())) {
|
|
|
//游戏id
|
|
|
criA.where().andInList("a.game_id", dto.getGameId());
|
|
|
- } else {
|
|
|
- //游戏id
|
|
|
- criA.where().andInList("a.game_id", Arrays.asList(35L, 36L, 10035L));
|
|
|
}
|
|
|
+ //超父id,必传
|
|
|
+ criA.where().andInList("game.super_game_id", List.of(12L));
|
|
|
if (StringUtils.isNotEmpty(dto.getRoleId())) {
|
|
|
//角色id
|
|
|
criA.where().andEquals("a.role_id", dto.getRoleId());
|
|
@@ -1625,8 +1624,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
if (dto.getLevelTimeMin() != null && dto.getLevelTimeMax() != null) {
|
|
|
criA.where().andBetween("a.level_time", dto.getLevelTimeMin().atTime(LocalTime.MIN), dto.getLevelTimeMax().atTime(LocalTime.MAX));
|
|
|
}
|
|
|
- if(StringUtils.isNotEmpty(dto.getRemark())){
|
|
|
- criA.where().andLike("b.remark",dto.getRemark());
|
|
|
+ if (StringUtils.isNotEmpty(dto.getRemark())) {
|
|
|
+ criA.where().andLike("b.remark", dto.getRemark());
|
|
|
}
|
|
|
|
|
|
return criA;
|