|
@@ -54,12 +54,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
}
|
|
}
|
|
//创建查询条件 给主表使用
|
|
//创建查询条件 给主表使用
|
|
Criteria criA = Cnd.cri();
|
|
Criteria criA = Cnd.cri();
|
|
- if (dto.getGameId() != null) {
|
|
|
|
- criA.where().andEquals("role_reg_game_id", dto.getGameId());
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(dto.getGameId())) {
|
|
|
|
+ //角色注册子游戏
|
|
|
|
+ criA.where().andInList("role_reg_game_id", dto.getGameId());
|
|
}
|
|
}
|
|
- if (dto.getParentGameId() != null) {
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(dto.getParentGameId())) {
|
|
//角色注册父游戏
|
|
//角色注册父游戏
|
|
- criA.where().andEquals("role_reg_parent_game_id", dto.getParentGameId());
|
|
|
|
|
|
+ criA.where().andInList("role_reg_parent_game_id", dto.getParentGameId());
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(dto.getSourceSystem())) {
|
|
if (StringUtils.isNotBlank(dto.getSourceSystem())) {
|
|
criA.where().andEquals("source_system", dto.getSourceSystem());
|
|
criA.where().andEquals("source_system", dto.getSourceSystem());
|