|  | @@ -129,7 +129,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
 | 
											
												
													
														|  |          //执行查询
 |  |          //执行查询
 | 
											
												
													
														|  |          return page(param.toPage(), new QueryWrapper<GameUserRole>().lambda()
 |  |          return page(param.toPage(), new QueryWrapper<GameUserRole>().lambda()
 | 
											
												
													
														|  |                  .in(CollectionUtils.isNotEmpty(userIdSet), GameUserRole::getUserId, userIdSet)
 |  |                  .in(CollectionUtils.isNotEmpty(userIdSet), GameUserRole::getUserId, userIdSet)
 | 
											
												
													
														|  | -                .eq(Strings.isNotBlank(param.getServerName()), GameUserRole::getServerName, param.getServerName())
 |  | 
 | 
											
												
													
														|  | 
 |  | +                .like(Strings.isNotBlank(param.getServerName()), GameUserRole::getServerName, param.getServerName())
 | 
											
												
													
														|  |                  .like(Strings.isNotBlank(param.getRoleName()), GameUserRole::getRoleName, param.getRoleName())
 |  |                  .like(Strings.isNotBlank(param.getRoleName()), GameUserRole::getRoleName, param.getRoleName())
 | 
											
												
													
														|  |                  .in(gameMap != null, GameUserRole::getGameId, gameMap != null ? gameMap.keySet() : null)
 |  |                  .in(gameMap != null, GameUserRole::getGameId, gameMap != null ? gameMap.keySet() : null)
 | 
											
												
													
														|  |                  .eq(Strings.isNotBlank(param.getOs()), GameUserRole::getOs, param.getOs())
 |  |                  .eq(Strings.isNotBlank(param.getOs()), GameUserRole::getOs, param.getOs())
 |